Merge branch 'hotfix/refactor-20141012'
fix AOJ language resolver to support Python2/3
travis: Update .travis.yml
Bump version into 0.2.4
Merge branch 'hotfix/0.2.4' into develop