Cleanup and some security enhancements
Merge pull request #16 from ChrisWiegman/dev

Cleanup and some security enhancements
Merge pull request #17 from JeffMatson/dev

Merge from dev