Added some paths to the martintools
Merge branch 'master' of github.com:thuetz/userdir-configs

Conflicts:
	configs/bashrc
Updated the user scripts for running at work
Removed the wmname command (its not available if X is not running)
Added a output message which shell script was loaded