passwords for heroku deployment
Merge branch 'development' into heroku
Merge branch 'development' into heroku
Merge branch 'development' into heroku
Merge branch 'development' into heroku
comment out the image part of a post right now, since it doesn't seem to be working for production
Merge branch 'development' into heroku

Conflicts:
	app/views/posts/_post.html.haml
missing image holder check
update gemfile lock for newer rake
Merge branch 'development' into heroku
Merge branch 'development' into heroku
Merge branch 'development' into heroku
Merge branch 'development' into heroku
Merge branch 'development' into heroku
Merge branch 'development' into heroku
Merge branch 'development' into heroku

Conflicts:
	Gemfile.lock
git ignore update to ignore all rvmrc and fix busted gallery
remove deprecated plugins
updating verivore to ruby 2 and rails 3.2.12