updated config files
Merge branch 'master' of github.com:kyoshiro/configfiles

Conflicts:
	.vimrc