template.php changes
Merge branch 'theme' of github.com:gaborpeter/drushmake into theme