Moving this stuff across from bitbucket.