added a rebuild and reset, repurposed from wordpress theme 2012
Merge branches '0.1' and 'master'