Template update.
Merge branch 'master' of https://github.com/chadwhitman/Base-Theme