Updated setup.py
Added template testing
Merge branch 'master' of github.com:mickep76/pepa
Moved stuff