Merge branch 'release/20130913.1' into develop
Add grunt completion script
Merge branch 'feature/add_grunt_completion' into develop
Move bash functions/config files into conf directory; update bash profile
Merge branch 'feature/restructure-directories' into develop
Bump version
Merge branch 'release/20130914.1'