Added better_errors to the Gemfile, lo and behold awesome errors.
adds .ruby-version for rbenv
fixes merge conflict