Workstation changes
Merge branch 'master' of github.com:ecnahc515/dotfiles

* 'master' of github.com:ecnahc515/dotfiles:
  Remove color picker. Add handlebars indentation settings
  Update configs

Conflicting virtualenvwrapper. Sourcing both.

Conflicts:
	zshrc