Fix for https
minor tweaks
Merge remote-tracking branch 'meeech/master' into textmate_1