Lots of new stuff

Signed-off-by: Alec Cumming <a.cumming@bigspaceship.com>
Merge branch 'master' of github.com:acumming/Dotfiles

Signed-off-by: Alec Cumming <a.cumming@bigspaceship.com>

Conflicts:
	.bash_profile