Fix adapters/loadedAdapters bullshit
Update travis build status image
Merge remote-tracking branch 'mde/master' into scaffold-fixes-and-tests