Add travis-ci status badge to README.rst
Merge branch 'master' into develop
Fix test failure in Python 3.3
Fix functional tests error in Travis-CI
Remove unnecessary before_script in .travis.yml
Refactoring for tests