Adjusting project settings.
Merge pull request #5 from mrhwick/development

Adjusting project settings.
Merge pull request #6 from bellhops/master

Merge master into dev.