Upgrade to Rails 4 and Ruby 2
First spec passing
Basic site structure. Added framework CSS. Routes etc.
Attempted to fix merge conflicts
The app is fucked at the moment.
App is working.