Add notes on shell options, job management
Normalise bash options and configure helpful shopt settings
Add htop and lynx as installed apps
Add ldap-utils as apps
Merge branch 'master' of github.com:davidjb/dotfiles

Conflicts:
	NOTES.rst
	bashrc