Switched from ZenCoding to Emmet
added diffmerge to OSX bin
Perodic Sublime Text 2 updates