Adding grunt and steam
Adding removal of trailing whitespace
Merge branch 'master' of github.com:jhummel/dotfiles