move production site up first so that people without SNI get the right cert for production
Added Elaine to the site
deleted Elaine info
Added Elaine info for site
 adjusted elaine to site
 adjusted elaine to site
Merge pull request #338 from 18F/add_elaine

Add elaine
Adding Russ
Merge pull request #340 from russu/add-russ

Adding Russ
Add Mike Bland (mbland) to the front page
Merge pull request #342 from mbland/staging-add-mbland

Add Mike Bland (mbland) to the front page
Adds an MVP for a team page with a map.

Pretty simple. Adds a map with the locations of our offices and locations
of remote workers with the same basic circle pictures below, grouped by
location. Click on a marker and a popup will show the name of the city and
you can click a link to see who works there. Very simple and "designed by
greg." Throwing it out there to start some discussion.
This should resolve the uncaught exception, template errors
Needs location data to go
Merges location and team data files, adds pifs
Merge branch 'staging' of github.com:18F/18f.gsa.gov into team_map

Conflicts:
	_data/team.yml
Merge branch 'team_map' of github.com:18F/18f.gsa.gov into team_map

Conflicts:
	_data/team.yml
	pages/team.html