add some more aliases
remove f4 macro, doesn't work
Merge branch 'master' of github.com:chazy/settings

Conflicts:
	aliases