Add git status to bash prompt
Show current dirname in terminal window title
Add automatic inline alias expansion in bash

Make changes to aliases to accommodate this
Add git aliases
Change git push behaviour from 'matching' to 'simple'
Revert "Make changes for Linux Mint"

This reverts commit d07bed0f6296d06df961b2a82b205f34a0046d31.

Conflicts:
	xinitrc
Load VirtualBox client when starting X
Alter Xresources to handle high DPI display
Start X automatically at login
Start GNOME keyring together with X
Add trackpoint mouse wheel emulation

Conflicts:
	xinitrc
Add wallpaper