Merge pull request #49 from BrassGoggledCoders/nightly

Nightly into Master
Merge pull request #1 from BrassGoggledCoders/master

Updates for moi
Merge pull request #51 from Surseance/master

Moar stuff