Merge in from develop branch

Included updates:
* Travis CI and David DM inclusion