Troubleshooting new job
Merge branch 'new_database' of https://github.com/vvilla/pasteur into new_database

Conflicts:
	app/assets/javascripts/new_job.js
Troubleshooting