update bundle with templates
rename some test files
Merge pull request #256 from potch/master

re-build and tests