Merge pull request #54 from fma2/final-changes

Travis-CI
Merge branch 'master' of https://github.com/red-spotted-newts-2014/translateYo into final-changes