Auto merge of #291 - aneeshusa:reenable-cross-on-travis-after-fix-for-arm-g++-packages, r=larsbergstrom
Auto merge of #291 - aneeshusa:reenable-cross-on-travis-after-fix-for-arm-g++-packages, r=larsbergstrom

Re-engage servo-linux-cross1 on Travis

Upstream has released new packages for Ubuntu Trusty which resolve
the installation conflicts encountered when installing the ARM g++ packages.

See https://bugs.launchpad.net/ubuntu/+source/gcc-4.8-armhf-cross/+bug/1557205/comments/16
for a comment confirming release of the upstream fix.

This reverts commit aa8435536091a125494786997ab3c408dc3b3386 which was part of #274.

Closes #280.

<!-- Reviewable:start -->
---
This change is [<img src="https://reviewable.io/review_button.svg" height="35" align="absmiddle" alt="Reviewable"/>](https://reviewable.io/reviews/servo/saltfs/291)
<!-- Reviewable:end -->

rwaweber/saltfs,servo/saltfs,ALikhachev/saltfs,ALikhachev/saltfs,UK992/saltfs,rwaweber/saltfs,ALikhachev/saltfs,UK992/saltfs,UK992/saltfs,servo/saltfs,rwaweber/saltfs,setupminimal/saltfs,setupminimal/saltfs,setupminimal/saltfs