forgot to check in a bunch of fixes
Merge branch 'master' of github.com:MozillaFoundation/plan into ia
Merge pull request #128 from MozillaFoundation/ia