updates 03/21/14
Merge branch 'master' of https://github.com/lakesareadesign/bash.box