Merge pull request #24 from josephbooth/master

lots of fixes
Merge pull request #25 from josephbooth/master

1111
STUFF
Merge pull request #6 from stalderc/master

pulling any updates made since last night