A little refactoring in users controller
Merge remote-tracking branch 'upstream/master'

Conflicts:
	app/controllers/users_controller.rb
removes authorization on password resets
Merge remote-tracking branch 'upstream/master'

Conflicts:
	app/controllers/users_controller.rb
Merge remote-tracking branch 'upstream/master'
Merge remote-tracking branch 'upstream/master'

Conflicts:
	app/controllers/users_controller.rb
Merge remote-tracking branch 'upstream/master'
Remove guard and spork in favor of zeus
Merge remote-tracking branch 'upstream/master'
Merge branch 'master' into development
fix announcements_spec to use js
update rails to 3.2.13 and readd guard
rename requests folder to features to make it work with capybara 2
fix issues caused by updating to capybara 2
remove focus tag
Merge remote-tracking branch 'upstream/master' into development

Conflicts:
	Gemfile.lock
bug #39, user can undo/remove a tag from favorites
lets just see the dots in rspec and forget the messy terminal
add pry-nav for debugging
cpatcha should be visible on preview, Bug #28