Dotfile cleanup
Merge branch 'master' of github.com:Joshkunz/.files

Conflicts:
	.bashrc
	.vimrc
	.weechat/aspell.conf
	.weechat/irc.conf
	.weechat/relay.conf
	.weechat/weechat.conf