Quick fix for email bug.  Will need a cleanup later.
Move to HAML
Fixed pending in view
Merge pull request #7 from Orasi/change-cancel

Change cancel
Testing vacation mailers and adjusted the email generating code.
Added some rubocop goodness
Merge pull request #8 from Orasi/change-cancel

Testing vacation mailers and adjusted the email generating code.
Rubocop cleanup and covering contractor pdo request
Merge branch 'staging' of github.com:Orasi/blue-source into staging

Conflicts:
	test/fixtures/vacations.yml
Adding a bunch more test coverage
Everything is now yellow or green...
More vacation test coverage
Changed the application name for cert for now.
Accidently brought in datepicker...
Merge branch 'staging' into jquery-datepicker

Conflicts:
	app/assets/stylesheets/application.css.erb.scss