Add PebbleSDK to path
Merge branch 'master' of github.com:jamesoff/oh-my-zsh

Conflicts:
	.zshrc