.htaccess removed.
Merge branch 'master' into source
More restructuring.
Wintersmith folder renamed.