Alter .xinitrc for use on the laptop
Alter tint2rc for use on the (single display) monitor
Merge branch 'master' into maka
Merge branch 'master' into maka
Delete accidental commited files