cleaned up commented code fixed jshint warnings
Merge branch 'develop'