misc
Merge branch 'master' of https://github.com/smav/configs

Conflicts:
	.bash_profile