added aliases and refactored work sepecific stuff
Merge branch 'master' of github.com:pickle27/dotfiles

Conflicts:
	bash/shopify.bash