add foreman alias
Merge branch 'master' of github.com:twinge/dotfiles

Conflicts:
	zsh/aliases