Disable a maddening spacing reset.
Add git alias to push a development branch to heroku's master branch.

This assumes a remote named "heroku" is available.
Add livestyle vim plugin.
Update the zshtheme being used, add a few aliases.
Tweak vim config some, add emmet-vim plugin.
Merge branch 'master' of github.com:miketierney/dotfiles