Merge pull request gitlabhq#2390 from simi/master

No need to install custom phantomjs for travis.

Author: dzaporozhets

.travis.yml

@@ -3,10 +3,6 @@ env:
   - DB=mysql
 before_install:
   - sudo apt-get install libicu-dev -y
-  - wget -P /tmp http://phantomjs.googlecode.com/files/phantomjs-1.7.0-linux-i686.tar.bz2
-  - tar -xf  /tmp/phantomjs-1.7.0-linux-i686.tar.bz2 -C /tmp/
-  - sudo rm -rf /usr/local/phantomjs
-  - sudo mv /tmp/phantomjs-1.7.0-linux-i686 /usr/local/phantomjs
   - gem install charlock_holmes -v="0.6.9"
 branches:
   only: