style changes
changes to form markup.
changes to markup.
Merge remote-tracking branch 'origin/master' into david

Conflicts:
	app/views/watchers/index.html.erb
Adds markup and styles to theme the site.