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
Added @SpaceCityJS
Added @btconf
Added html5devconf
Merge branch 'master' of github.com:RichardLitt/awesome-conferences into link-conf-names

Conflicts:
	README.md