Merge pull request #3 from David-B55/master

Large merge, should have working i2cat and ubris OF rspecs