sastify jshint
clean up codebase thanks @xuyoubo for helping out
Merge remote-tracking branch 'origin/master'