Disabled some start scripts
Removed a command which can not be executed without x
Merge branch 'master' of github.com:thuetz/userdir-configs

Conflicts:
	configs/bashrc
Added the Android Key Store to the export script for Zockepeter