removed es5, which is now default
Merge branch 'master' of ssh://github.com/coolaj86/dotfiles
cleanup with idea saving / updating