vim aliases
Package update
More packages
Merge branch 'ubuntu-tweaks' of github.com:michaeljoseph/dotfiles into ubuntu-tweaks

Conflicts:
	packages/packages.txt