linting
Merge branch 'master' into jshint
jshint pass
jshint second pass
make lint task
Merge branch 'jshint'