Remove option in translation to allow entities
Merge branch 'master' of github.com:rackspace/repose into daley
Merge branch 'daley', remote-tracking branch 'origin'