Changes for boat actions
Merge branch 'master' of https://github.com/mildmojo/tugtug