Merge pull request #303 from jerv13/master

Basic site cloning
Merge remote-tracking branch 'upstream/master'