fix
moved autostart to xinitrc
Merge branch 'master' into caprica

Conflicts:
	openbox/autostart.sh
	xinitrc