Cleaning up a bit
Fix for pyton 3.2
Triggering Travis Build
Resolve minor issue, and fix tests
Resolving bad test
Require mimeparse for mockapi