fixing jshint errors. changing jshint to allow for functional style coding.
Merge remote-tracking branch 'origin/master'