Merge pull request #209 from drio/master

Clean up google maps code. (Issue 87)
Merge pull request #210 from drio/master

Fixing popup links to bootcamps.
Badges for five more instructors
Merge branch 'master' of github.com:swcarpentry/site
Fixing broken links
Merge pull request #211 from gvwilson/fixing-broken-links

Fixing broken links
Correct Julian Garcia's name
Merge pull request #212 from juliangarcia/name_correction

Correct Julian Garcia's name
Putting link-checking command into Makefile
Merge branch 'master' of github.com:swcarpentry/site
Add Raniere Silva
Added Manchester Matlab bootcamp
Merge branch 'add-me' of github.com:r-gaia-cs/site into r-gaia-cs-add-me
Add Raniere Silva
Merge branch 'add-me' of github.com:r-gaia-cs/site into r-gaia-cs-add-me
Adding more instructors
Making keywords consistent
Correct link for Man MATLAB
Merge pull request #215 from apawlik/addManMAT

Added Manchester MATLAB bootcamp
Making sure there's a trailing newline in the bootcamp URL config file