Update content.py
Update constants.py
Update puppet.py
Update AUTHORS
fixes according to comments in pull request #121
Removed unnecessary import
Merge pull request #1 from doddo/pgustafs-1099456

fixes according to comments in pull request #121
Fixed tests and comments according to comments in pull-req #121
Merge pull request #2 from christoe/pgustafs-1099456

Fixed tests and comments according to comments in pull-req #121
Merge branch 'pr/121'