Adding sublimerge package, fixing problems with ssh
Temp fix for sublime text packages, xfce configs