Merge branch 'release/20130829.2' into develop
Add function to shortcut dash from bash
Merge branch 'feature/add_dash_function' into develop
Add makefile script for encrypting sensitive data
Merge branch 'feature/add_makefile_function' into develop
Add bash environment variables file; source file from bash profile
Update symlinks to include bash environment variables
Merge branch 'feature/add_bash_env' into develop
Update changelog
Merge branch 'release/20130913.1'
Fix version number in changelog
Merge branch 'release/20130913.1'