Added Map widget to post#show
Merge branch 'master' of git://github.com/michaelchu/photo_blog into michaelchu-master

Conflicts:
	app/assets/stylesheets/controllers/posts.css.scss
	app/models/post.rb
	app/views/layouts/application.html.erb
	app/views/posts/_show_content.html.erb
update gems, fix back map