Added rspec and some stub tests
Clean up code, temporarily disable http auth
Fix merge conflict in application_controller