-tneale from travis
Merge branch 'master' of github.com:sunlightlabs/billy