es5 and es6 linting Fri Jun  6 11:32:24 GMT 2014
Merge branch 'master' into gh-pages