Merge pull request #14 from BrassGoggledCoders/nightly

Merge pull request #13 from BrassGoggledCoders/master
Uhhh...
Merge pull request #15 from MrArcane111/master

Bleeding edge updates