about to merge
Merge branch 'master' of https://github.com/bclay/pamentor
removed meteor