More 1.6 fixes:

* markup tags
* Upgrade packages
* Fix up API
Update packages and fix some tests.
Fix test and migration settings.
More 1.6 compat
Passing tests! :)
Small cleanup
Update packages
More upgraded packages
Upgrade nose
Remove unused requirements