base: ignore vim backups and unignore share dir
Merge branch 'master' into fluxbox

Conflicts:
	.gitignore
base: added dir .configitor

new file:   .configitor/README.md
modified:   .gitignore
Merge branch 'master' into fluxbox
base: added empty .gitmodules

new file:   .gitmodules
Merge branch 'master' into fluxbox