Merge lists

[ryanburgess]

I had started a list a while back as well. Feel free to grab ones from my list as well https://github.com/ryanburgess/2016-conferences

[trstringer]

@ryanburgess great, will do! Thanks!!! 👍