fixing testing issues with using symbols beginning with :test, moving acts as paranoid in user.rb, reloading test routes before use
merging in changes from master