Updates for Ubuntu PPA
Improve the Makefile
Leftover change from clearing ProtoV2 code: increment settings version from 7 to 8
Resolve minor merge conflict
Merge branch 'bashrc-master'