Retry simplifying travis.
Added a branch alias.
Use `.x`.
See http://getcomposer.org/doc/articles/troubleshooting.md#package-not-found-on-travis-ci-org.
Merge branch '1.2'