stand prep for puppet
gains

Merge branch 'master' of http://github.com/siyuanfeng/jimmy

Conflicts:
	src/test_puppet.cpp