fix merge bug
Merge branch 'master' of https://github.com/cameronr/oh-my-zsh
fix when boot2docker not installed
fix when boot2docker isn't installed