Merge branch 'master' of git.elangley.org:dotfiles

Created by  fiddlerwoaroof  on April 28, 2015
WZCBNXELNG5DLBNZLEJNOVCAYWFRPA3BKKLX2NNDNEHGX3TMTXPAC
Change contents