Support boxen, for those who use it, and use more standard rails database names
Update gems to rails 4.1.4 compatible versions
Upgrade to Rails 4 and include the annotate gem
Update README to reflect updated Rails version
Merge commit '1d54f9d0f1304a905aa98c618783bc4761c61172'

Conflicts:
	README.md