Update linux
Merge branch 'master' of github.com:ghostnetwork/tools

Conflicts:
	bin/linux/pull-sublime-settings