Reverted Xmodmap changes
Update bash prompt and slight reorganisation