Trying to move everything to the controller + rubocop
Merge branch 'master' into cleanup-reporting
Moving stuff to haml...
Merge branch 'staging' into cleanup-reporting
Fixing up the views a bit
Rubocop cleanup
Needed to change the CSV too!
Added sorting icon.
Adding JSON download support just because
Added new report support
Fixes form sending wrong parameter
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