Merge pull request #238 from mozilla-services/dev

Merging from Dev
Merge pull request #254 from mozilla-services/dev

Merge latest mods from dev
Merge remote-tracking branch 'upstream/master' into frontend-htmllint
adding htmllint task to grunt lint task