Merge pull request #34 from tisdall/master

slightly modified one test so it's less MySQL specific
Merge branch 'master' of git://github.com/stefanofontanelli/ColanderAlchemy into hotfix
Merge pull request #37 from tisdall/hotfix

small fix to correct markdown display in docs