added sublime to user gitignore
Merge branch 'master' of https://github.com/limeyd/dotrine
removed osx terminal colors