Rebooting dotfiles with much better organization
Removing .swp from repo
Simplifying
Merge branch 'reboot'
Fixed merge conflict.

Conflicts:
	bashrc.symlink