Clean up template Files

Condense into index.php mostly.
version update
Merge pull request #1 from evanfuture/master2

Master2