Update from package control fork

Updating to most recent changes