a few minor changes, getting rails to work again

The lock file was outdated as rake had been updated. Had to remove the
lock file and then update a bunch of gems. was a massive pain in the
ass, but got it all working.

Just wanting to push the current edition up to heroku now.