More cleanup
Added department keys
Merge branch 'master' of github.com:joshcaron/Volans