moved more stuff to puppet
Merge pull request #8 from racker/songgao/use-puppet

moved more stuff to puppet