Updating .gitignore to include edit.bash
Merge branch 'staging'