Merge pull request #62 from cesine/travis

More changes due to travis integration
Merge pull request #63 from cesine/feature-fielddb-integration

Feature fielddb integration
Merge branch 'master' of github.com:jrwdunham/dative into release001
running only on master
maybe the y will help

travis isnt creating builds on the branches
Merge branch 'travis' into release001