Added new Git and Apache Alias
Merge branch 'master' of https://github.com/neutraltone/Terminal-Setup

Conflicts:
	zsh/.zshrc