Add Sublime Text and finish OSX. Fix up formatting/