Merge pull request #97 from heatsynclabs/master

Kevin's changes to production
Merge branch 'master' into production