Repository shift

Updating all files to the latest from the broken copy of Snogger.