Little shits
	modified:   app/controllers/rotations_controller.rb
	modified:   app/controllers/shifts_controller.rb
	modified:   app/mailers/shift_notifier.rb
	modified:   app/models/shift.rb
	modified:   app/views/events/_form.html.haml
	modified:   app/views/shifts/_form.html.haml
	modified:   config/routes.rb
Merge branch 'master' into bug/debugger

Conflicts:
	config/routes.rb

	modified:   config/routes.rb
	modified:   spec/controllers/shifts_controller_spec.rb
	modified:   spec/factories/events.rb
Merge pull request #50 from dlmather/bug/debugger

Bug/debugger