Compatibility changes for Indigo and Ubuntu Trusty
Merge branch 'master' of github.com:davetcoleman/clam