Use xscreensaver for power settings
Handy alias for $
Vim tabs changed to 4 spaces
Vim tabs fixed
Merge branch 'master' into minimal

Conflicts:
	.xinitrc

Merge
Back to using XFCE power manager
Personalized vimrc
Merge branch 'master' into minimal

Conflicts:
	.xinitrc

Merged