Be less specific with PHP versions for Travis.
Merge branches '2.2/develop' and '2.2/develop' of github.com:pyrocms/pyrocms into 2.2/develop
Re-added IP v6 support for fresh installs.
We added a migration back in september to make installs IP v6, but the installer was not updated. That means going from 2.1 to 2.2 will give you IPv6 support but fresh installs will freak out.
Fixed travis conflict.