Mark the TODO to remove the noconflict
Use the aliased method name
Merge branch 'master' into redesign

Conflicts:
	app/controllers/admin/contacts_controller.rb
	app/controllers/admin/events_controller.rb
	app/controllers/admin/posts_controller.rb
	config/initializers/kaminari.rb
Fix pagination
Refactor some scopes
Use modern response methods
Clean up jobs
Test mailing list mailer
Remove unneded pending
Bump thread_safe
Convert pretty much everything to erb
Fix layout in erb
Bump rails to 4.0.5
Remove unneded broken test
Merge branch 'master' into redesign

Conflicts:
	Gemfile.lock
	spec/controllers/admin/contacts_controller_spec.rb
Rough in FB OG partial
Merge in FB OG
Add config gem
Add settings files
Use settings rather than constants