Update import order per @brutasse in #575
Merge branch 'pr/575' into 0.9.x
Merge branch '0.9.x' of github.com:graphite-project/graphite-web into 0.9.x