Merge pull request #4 from sotandeka/master

C2x changes
Remove smarty files
Remove backup file
Merge pull request #4 from timschofield/master

Remove unnecessary files