Add a lint tox target, fix all import issues
Fix some whitespace issues
Merge branch 'master' into feature/lint

Conflicts:
	webapp/graphite/cli/commands.py
	webapp/graphite/cli/parser.py
Fix some newly introduced whitespace issues
Merge pull request #853 from brutasse/feature/lint

Lint