better variable names
better variable names
Merge branch 'master' into treyhunner-extra-attributes

Conflicts:
	parsley/decorators.py
Merge branch 'master' into treyhunner-extra-attributes

Conflicts:
	parsley/decorators.py