commit from cerys 18 July 2013
Merge branch 'master' of https://github.com/dimbyd/dotfiles