moor tidy of apps/amo
Merge pull request #2460 from eviljeff/moreamotidy

bug 1042820 - moor tidy of apps/amo