adding jasmine related globals to jshintrc
Merge branch 'master' of https://github.com/geoffberger/env
removed all cache related files
resolved conflict
sublime preference related