Merge pull request #1 from brittanystoroz/master

Fix jsconf link
Added Geospatial Canada
Merge branch 'master' of github.com:RichardLitt/awesome-conferences

Conflicts:
	README.md
Link North American confs
Link South American confs
Link Australian confs
Link Asian confs
Added @SpaceCityJS
Link misc confs
Link EU confs
Added @btconf
Added html5devconf
Link conf names
Merge branch 'master' of github.com:RichardLitt/awesome-conferences into link-conf-names

Conflicts:
	README.md