First stab at Rails4 upgrade and then some
Merge branch 'feature/rails4_upgrade' into dev