Tweaks to completion. Source bashrc-local if it exists.
Merge branch 'master' of http://github.com/dpirie/dotfiles

* 'master' of http://github.com/dpirie/dotfiles:
  Delete jmeter