various clean ups
Merge branch 'master' of https://github.com/lunchpad/lunchpad
Merge branch 'master' of https://github.com/lunchpad/lunchpad
Merge pull request #138 from kheang/master

Clean ups