reverting back to old monitor forms
final refactor of ping monitor and test cleanup
Merge branch 'master' into monitors

Conflicts:
	app/controllers/dashboard_controller.rb
	app/controllers/monitors_controller.rb
	app/models/user.rb
	app/views/dashboard/index.html.haml
	app/views/monitors/_form.html.haml
	app/views/monitors/_update_form.html.haml
	app/views/monitors/show.html.haml
	spec/integration/monitors_functionality_spec.rb
Remove integration test