Fix minor build issues, including #17
Merge branch 'master' of github.com:marcoarment/BugshotKit