Major clean up of project
Merge pull request #3 from carlpratt/project_cleanup

Major clean up of project