Create appointment option so a volunteer can either confirm or deny they are coming for a shift.
Separated old and new events
	modified:   app/controllers/events_controller.rb
	modified:   app/models/event.rb
	modified:   app/views/events/_form.html.haml
	modified:   app/views/events/index.html.haml
	new file:   app/views/events/old.html.haml
	modified:   config/routes.rb
	modified:   db/schema.rb
Merge branch 'master' into feature/saveOldEvents

Conflicts:
	app/models/event.rb
	config/routes.rb
	db/schema.rb

	modified:   Gemfile
	modified:   Gemfile.lock
	modified:   app/assets/javascripts/application.js
	new file:   app/assets/javascripts/bootstrap.js.coffee
	modified:   app/assets/javascripts/shift.js
	modified:   app/assets/stylesheets/application.css
	new file:   app/assets/stylesheets/bootstrap_and_overrides.css
	modified:   app/controllers/events_controller.rb
	new file:   app/controllers/rotations_controller.rb
	modified:   app/controllers/shifts_controller.rb
	modified:   app/controllers/users_controller.rb
	modified:   app/controllers/volunteers_controller.rb
	new file:   app/helpers/rotations_helper.rb
	modified:   app/models/event.rb
	new file:   app/models/rotation.rb
	modified:   app/models/shift.rb
	modified:   app/models/user.rb
	modified:   app/views/events/index.html.haml
	modified:   app/views/events/show.html.haml
	modified:   app/views/layouts/application.html.haml
	new file:   app/views/rotations/_form.html.haml
	new file:   app/views/rotations/edit.html.haml
	new file:   app/views/rotations/index.html.haml
	new file:   app/views/rotations/new.html.haml
	new file:   app/views/rotations/show.html.haml
	modified:   app/views/shifts/_form.html.haml
	modified:   app/views/shifts/index.html.haml
	modified:   app/views/shifts/new.html.haml
	new file:   app/views/users/_form-edit.html.haml
	new file:   app/views/users/_form-new.html.haml
	modified:   app/views/users/_form.html.haml
	modified:   app/views/users/edit.html.haml
	modified:   app/views/users/index.html.haml
	modified:   app/views/users/new.html.haml
	modified:   app/views/volunteers/_form.html.haml
	modified:   app/views/volunteers/edit.html.haml
	modified:   app/views/volunteers/index.html.haml
	modified:   app/views/volunteers/new.html.haml
	new file:   config/locales/en.bootstrap.yml
	new file:   config/newrelic.yml
	modified:   config/routes.rb
	new file:   db/migrate/20131207234926_add_active_to_events.rb
	new file:   db/migrate/20131208025919_add_name_to_users.rb
	new file:   db/migrate/20131208042439_create_rotations.rb
	renamed:    db/migrate/20131124082527_create_delayed_jobs.rb -> db/migrate/20131208055839_create_delayed_jobs.rb
	new file:   db/migrate/20131208060824_add_rotation_number_to_rotations.rb
	new file:   db/migrate/20131208061242_add_rotation_id_to_shifts.rb
	modified:   db/schema.rb
	modified:   db/seeds.rb
	new file:   spec/controllers/rotations_controller_spec.rb
	new file:   spec/helpers/rotations_helper_spec.rb
	new file:   spec/models/rotation_spec.rb
	new file:   spec/requests/rotations_spec.rb
	new file:   spec/routing/rotations_routing_spec.rb
	new file:   spec/views/rotations/edit.html.haml_spec.rb
	new file:   spec/views/rotations/index.html.haml_spec.rb
	new file:   spec/views/rotations/new.html.haml_spec.rb
	new file:   spec/views/rotations/show.html.haml_spec.rb
Fixed db seed to include "active" field of events and fixed views

	modified:   app/views/events/old.html.haml
	modified:   db/schema.rb
	modified:   db/seeds.rb
Merge pull request #34 from dlmather/feature/saveOldEvents

Feature/save old events
Added ability for multiple users to be reminded when a volunteer states that they may or may not be coming.
Added mailers to send reminders to associated coordinators.
Remove repetitious code.
Added js logic to prevent creating events with invalid dates.  Ex: 2/31/13
	new file:   app/assets/javascripts/dates.js
	modified:   app/views/events/_form.html.haml
Merge pull request #35 from dlmather/bug/createEventTimes

Added js logic to prevent creating events with invalid dates.  Ex: 2/31/...
Redirect to volunteer index after creating or updating volunteer successfully
	modified:   app/controllers/volunteers_controller.rb
Merge pull request #36 from dlmather/bug/routingAfterCreateVolunteer

Redirect to volunteer index after creating or updating volunteer success...
Added ability to notify coordinators for an event when a volunteer either confirms or declines that they signed up for a shift.
Create appointment option so a volunteer can either confirm or deny they are coming for a shift.
Added ability for multiple users to be reminded when a volunteer states that they may or may not be coming.
Added mailers to send reminders to associated coordinators.
Remove repetitious code.
Added ability to notify coordinators for an event when a volunteer either confirms or declines that they signed up for a shift.
Fix merge conflicts.
Only send the volunteer an email if the volunteer exists for a given shift.