puppet librarian shortcut
Merge branch 'master' of github.com:deric/bash-scripts
added git aliases