random stuff
more random
no swp files in vim
Merge branch 'master' into work

Conflicts:
	bash_aliases
no bb