Merge pull request #1882 from Daxter/refactor-application.rb

Refactor application.rb
RSpec has been standard issue for a while, so `should` is a given
a little negation goes a long way
get rid of unused code
user_steps cleaning
tiny changes
moar cleanup
one more down!