Merge pull request #2 from markfinger/master

Base template changes
Replacing the default JS compression with UglifyJS.