travis: overhaul to include osx and clang testing

Signed-off-by: Rob Browning <rlb@defaultvalue.org>
Merge branch 'travis-config' into travis/master-new