ignore drive folder
moving aliases into their own file
ignore vagrant
Merge branch 'work'

Conflicts:
	.bash_profile
	.gitignore