updates
Added lots of things
lots of changes here. NOTE: YOU MUST REMOVE THE DEVELOPMENT DB FILE AND REGEN AFTER THIS UPDATE
Lots of changes, I think the site looks awesomer now
Lots of changes, going to try solr next
Installed solr
Lots of new stuff, we are getting MUCH closer. Added almost everything for admin_host and admin_product, plus they
 are pretty nice and user friendly.
Merge branch 'master' of github.com:albertrdixon/chicken-bacon

Conflicts:
	Gemfile.lock
	app/assets/javascripts/hosts.js.coffee
	app/controllers/deployments_controller.rb
	app/controllers/hosts_controller.rb
	app/models/deployment.rb
	app/models/environment.rb
	app/models/host.rb
	config/routes.rb
	db/migrate/20130723000927_create_deployments.rb
	db/schema.rb

Merging my local changes with the remote master