Merge branch 'release-0.5.0' into develop
fixes #212
Merge pull request #217 from vrabaud/fixes_212

fixes #212
0.5.1
Merge branch 'release-0.5.1' into develop
restore the setup.py to before the big 0.5.0 merge
Merge pull request #218 from vrabaud/setup_py_fuerte

restore the setup.py to before the big 0.5.0 merge
Merge branch 'master', remote-tracking branch 'ecto_develop/develop'