Merged upstream configuration.
Merged upstream changes.
Added appengine to path for linux.
Cancel update if the current user doesn't have write permissions for the oh-my-zsh directory.
Merge pull request #2358 from n-st/master

Cancel update if the current user doesn't have write permissions for the oh-my-zsh directory.
Revert "Cancel update if the current user doesn't have write permissions for the oh-my-zsh directory."

This reverts commit 152e1e07e0397ecc3f1778ea597d081c33ee8ff4.
better bb_ function

Signed-off-by: Gaetan Semet <gaetan@xeberon.net>
new alias: apt get update saguagu

Signed-off-by: Gaetan Semet <gaetan@xeberon.net>
Merge remote-tracking branch 'cadusk/master'

Conflicts:
	README.textile
	lib/aliases.zsh
	templates/zshrc-linux.zsh
	templates/zshrc-mac.zsh
	templates/zshrc.zsh-template
Merge remote-tracking branch 'upstream/master'