Merge branch 'master' into install_rspec

Merging master into this branch to get rid of extra commit messages.
*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
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
Merge pull request #36 from PhillyHealthDataRepo/upgrade_ruby_and_gems

Upgrade ruby and gems
Merge branch 'master' into install_rspec

* master:
Merge branch 'install_rspec'

* install_rspec:
  Install rspec and a few other gems for testing purposes (factory girl, capybara, launchy, selenium)
Merge branch 'master' into install_pg_for_development

* master: