Merging useful items from private bitbucket repository.  Might need to recreate this, since some of the stuff might have secret material (or just invalidate useless things).