removed trailing spaces
added trailing spaces back
added emmet, OS X shortcut, added padding to bottom of sublime editor
Merge branch 'master' of https://github.com/mattse/codex