Merge pull request #177 from BernhardKonrad/master

Puts marker clusters behind bootcamp markers. Also: New bootcamp & instructor icons
Adding flags of instructors' countries to team page
Fixing typo in macro name in Makefile
Merge pull request #269 from gvwilson/fixing-macro-in-Makefile

Fixing typo in macro name in Makefile
Merge pull request #270 from gvwilson/adding-country-flags-to-team

Adding flags of instructors' countries to team page
Adding a row of country flags to previous bootcamps markers
Merge pull request #272 from gvwilson/master

Adding a row of country flags to previous bootcamps markers
Putting testimonials in two columns
Merge pull request #273 from gvwilson/reformatting-testimonials

Putting testimonials in two columns
Adds maps of instructor locations on team.html. Locations are anonymous.