Preparing release 1.1
Back to development: 1.2
Remove stray pdb
PEP8-ing
Only update with a default value if there isn't a value already set on the field.
Merge branch 'default-values'
Preparing release 1.2
Back to development: 1.3
merge with master