Will/grady/self assessment feedback

@wedaly , we should talk about the Test changes and the changes to models/base.py
style nitpick: please use multi-line string concatenation:
```
(
    u"Foo bar"
    u"baz"
)
```