Hack: use helper functions in tests for less copy-pasting
Make docs build without warnings or errors. Minor additional cleanup.
fix error in utils tests
Merge pull request #1239 from dotcloud/fix_utils_tests

fix error in utils tests
rebase master
Merge pull request #1204 from dotcloud/tests-less-copypaste

Hack: use helper functions in tests for less copy-pasting
Merge pull request #1235 from metalivedev/cleandocbld

Make docs build without warnings or errors. Minor additional cleanup.