Merge pull request #4 from Italic-/master

Merge to meta
Updated Octane Instances to work with 2.69/2.70
Merge pull request #2 from meta-androcto/master

Merge with fork