Some modifications to the resolver since its supposed to be a bit more magical
ugh
All tests pass, but step 10 is questionable.
Changed format to use specific test classes.
Fixed step 10.
Cleaned up and abstracted test method.
Marked todo file.
Started on resolve test case.
continued resolve test case.
Merge branch 'master' into tasks/ARM-10
Resolve now returns the object associated with the resource.
Resolve actually returns the correct object.
Separated tests into their models.

Also prettified json, so it's actually readable.
Added more tests for polls.
Added more tests for choice, and cleaned up other things.
Updated todo list.
Changed the examples around a bit for fun.
Merge branch 'master' of github.com:armet/django-armet
Merge remote-tracking branch 'origin/tasks/ARM-10'
Merge remote-tracking branch 'origin/tasks/ARM-7'