Merge pull request #1 from indykish/master

Changes to move pug to meg and clean up to gear for 0.5 release