merge perception branch into master

I'd rather keep 'master' as the default branch for this repo, and so this is effectively just a rename of teh perception branch to master.