adding some spicy taste
commenting OSX-only stuff
Merge branch 'sublime-text' into dev