Update to fall in line with Rails 4, and remove any dependency's that aren't rails 4 compatibly yet.
Merge branch 'master' of https://github.com/rovermicrover/FlagpoleSitta