Merge: Fix a bit of everything: typos, doc, android, bucketed_game and vim