Refactored SQL creation, Added filter for departments
Cleaned up the output
Merge pull request #4 from mcharris/master

Added more filters and cleaned up the output