bumped version number
Merge branch 'release/v1.1' into dev
fixed jshint errors so grunt would stfu