js lint fixes
Merge branch 'master' of https://github.com/mideveloper/oyster