Merge pull request #4 from bakercp/develop

Develop
Merge pull request #5 from bakercp/develop

Develop
Merge pull request #6 from bakercp/develop

Develop
Merge branch 'develop'
Update OSX project files.
Merge branch 'develop'
No longer supporting OSX or windows Project files.  Generate them using the project generator.
Corrected header inclusion.
Whitespace.