Merge branch 'master' of github.com:allynfolksjr/Yet-Another-Monitoring-Program
Merge branch 'master' of git://github.com/SuperAwesomeSquad/Yet-Another-Monitoring-Program
controller and form refactor to prepare for multiple monitor types. blergh.
working on making monitors more generic
reset
Merge branch 'monitors' of git://github.com/serened/Yet-Another-Monitoring-Program into serened-monitors

Conflicts:
	app/models/base_monitor.rb
	app/models/user.rb
	db/schema.rb
Add thin config files
Merge pull request #17 from allynfolksjr/master

Add thin config files
Fixes for production
Merge pull request #18 from allynfolksjr/master

Fixes for production
Fix pingWorker
Fix webWorker
Remove seed raise
Add alert logic tree to base_monitor
Add alert logic tree to base_monitor
Merge branch 'master' of github.com:allynfolksjr/Yet-Another-Monitoring-Program

Conflicts:
	app/workers/ping_worker.rb
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
Merge branch 'master' of git://github.com/SuperAwesomeSquad/Yet-Another-Monitoring-Program
Merge pull request #20 from allynfolksjr/alerts

Alerts