Cleaning up #include statements
Merge pull request #6 from jhurliman/master

Cleaning up #include statements