updates

Signed-off-by: Nick Campbell <nicholas.j.campbell@gmail.com>
Merge branch 'master' of github.com:ncb000gt/dot-files