linux fixes and such
Merge pull request #6 from jonathanwgoodwin/linux_updates

linux fixes and such