Updated zshrc template for mac
Updated linux template.
Merge remote-tracking branch 'origin/master'

* origin/master:
  Added appengine to path for linux.
Merge remote-tracking branch 'cadusk/master'

Conflicts:
	templates/zshrc-mac.zsh