Merge pull request #80 from arthurnn/bump_rails

Bump rails to 3.2.15
Conflicts:
	lib/db_charmer/version.rb