Merging back to mine, making a couple changes. Everything is looking good so far.
Merge remote-tracking branch 'upstream/master'
Merge pull request #69 from SonOfLysander/master

Misc fixes to stuff