Rails4 compatibility.
Use new scope syntax.
Use new syntax for has_one includes.
Remove Gemfile.lock from git