minor refactoring
Merge branch 'master' of github.com:nicknish/backstage into soundcloud-auth

Conflicts:
	app/assets/stylesheets/application.css.scss
	app/controllers/users_controller.rb
add rudimentary soundcloud auth
update soundcloud auth
merge