Fix the build
Try and confirm if its distcheck at fault
Fix the travis script syntax
Fix the build in all cases
Revert "Fix the travis script syntax"

This reverts commit 7dc2371c53afdd31f7820accb355796e74369443.
Revert "Try and confirm if its distcheck at fault"

This reverts commit 5d0d5a331ed7a8ee70fab4363f946077ab5d94ca.
Merge pull request #334 from peternewman/trivial-fixes

Fix the build