removed Profont from default gvim configuration
Merge branch 'master' of https://github.com/alexjpaz/tilde
Merge branch 'master' of https://github.com/alexjpaz/tilde
fixes plus vimp git alias
Merge branch 'suzy' of https://github.com/alexjpaz/tilde into suzy
vim diff enhanced
Merge remote-tracking branch 'tilde/master' into suzy

Conflicts:
	.scripts/paz/fabric/__init__.py
git: add sandbox remote for backups
git: add sandbox remote for backups