have better dimension exclusions
address cr
cleanup
fix import
Merge pull request #738 from metamx/dim-ex

Have better dimension exclusions