Minor updates (laptop).
Merge branch 'master' of github.com:jameshanlon/configuration-files

Conflicts:
	bashrc
	en.utf-8.add