Some additions and clean ups for xinitrc
Merge .xinitrc additions and thinktux additions