Updating travis setup
Revert to original, final fix for travis build
Merge branch 'master' of github.com:jlhonora/ActiveAndroid