Switched js indent.
Got rid of auto-fill-mode for html.
Got rid of auto fill mode. set default js-indent-level.
Merge remote-tracking branch 'origin/master' into HEAD
Merge remote-tracking branch 'origin/master' into yelp