Fix 64-bit warnings
Merge branch 'master' of https://github.com/cheesemaker/toolbox
Fix includes
Merge pull request #44 from ryandevore/master

Fix includes