Build script: replace 'git' with branch name, add 'r' for revision number.
Added .gitignore to the right branch
Merge branch 'master' into shockrifle