pulling Marko & Travis' changes before syncing updated db_spec