get rid of the freakin' space myself

no reason I gotta make other people do that crap
Use two spaces for indent instead of four
Change login and logout to signin/signout
Merge branch 'torresga-new_auth' of github.com:PhillyHealthDataRepo/philly-open-health into torresga-new_auth

Conflicts:
	app/controllers/sessions_controller.rb
Change login to signin
Merge pull request #33 from PhillyHealthDataRepo/torresga-new_auth

Removed Devise, added basic authentication
Merge branch 'master' into upgrade_ruby_and_gems
Merging my changes to all branches.
* master:
  Change login to signin
  Change login and logout to signin/signout
  Use two spaces for indent instead of four
  get rid of the freakin' space myself