Fix motion activity + finally fix tour models!

• Upgrading to the new version of google play meant that the format of the motion activity changed yet again, which meant that our formatting was broken. We need to fix it.
• Removed all the old tour model code. Found that all tests failed because they were written for the old tour model. Updated tests and got them to pass. Tour model started working again, woot!