fixed test_cannonball test case
Merge branch 'master' of github.com:ntamas/yak
template simplifications