Merge branch 'develop' of https://github.com/Urbanetic/subdiv into develop

* 'develop' of https://github.com/Urbanetic/subdiv:
  Fixed issues with PhantomJS.
Added travis badge back.
Merge branch 'develop'

* develop:
  Added travis badge back.