Upgrade to rails 4
Merge branch 'dev' into dev_matt
Added database file to .gitignore. Added bootstrap javascript to application.js.