Merge branch 'dev' into aw_company_show

* dev:
  added seed. tweaked models to resolve latent errors
Merge branch 'dev' into aw_company_show

* dev:
  restoring functionality that was disabled while hunting for a bug.
  setups basic backbone for jobs
jobs list render is coming along
Added forms for job list, jobs, entries, and sidebars.  Updated balsamiq mockups.
Merge branch 'aw_forms' of github.com:johntrandall/contracto into _jr_setting_up_backbone

# By Andrew Wallace
# Via Andrew Wallace
* 'aw_forms' of github.com:johntrandall/contracto:
  Added forms for job list, jobs, entries, and sidebars.  Updated balsamiq mockups.

Conflicts:
	app/assets/javascripts/backbone/backbone_application_loader.js
	app/controllers/jobs_controller.rb
	app/views/companies/show.html.erb
	app/views/jobs/_index.html.erb

conflicts resolved to serve up multiple partials