Misc cleanup of dependencies

giannozz requested to merge giannozz/q-e:develop into develop Aug 06, 2018