getting latest
Merge branch 'master' of github.com:jusroberts-cb/job_map

Conflicts:
	app/assets/stylesheets/gmaps4rails.css.scss
Merge branch 'master' of github.com:jusroberts-cb/job_map
Merge branch 'master' of github.com:jusroberts-cb/job_map
changed some styling for map info window.
Merge branch 'master' of github.com:jusroberts-cb/job_map