Merge remote-tracking branch 'upstream/master'

* upstream/master: (39 commits)
  Update php.sh
  Added support for installing the packaged version of MariaDB as an alternative to MySQL. As an added bonus the script is now made aware of the distro version and codename.
  Added Debian 7 to the list of tested distros.
  PhpMyAdmin is now installed from source. This avoids some funk wtih Apache when installing from the Debian base repos.
  Reworked nxmksite to insert a better phpMyAdmin configuration.
  NginX upstream release
  Disabled MySQL and phpMyAdmin installation by default.
  Added support for phpMyAdmin.
  Minor bug fixes. Support for phpMyAdmin.
  nxensite, nxdissite, and nxmksite are now symlinked into /usr/sbin for easy console access.
  Moved index directives to the http clause per best practice.
  Better validation. New rules. Somme helpful comments.
  Added an early version of a vhost config generator.
  Ignoring .swp files to make working with Vim easier.
  Added support for phpMyAdmin.
  Minor bug fixes. Support for phpMyAdmin.
  nxensite, nxdissite, and nxmksite are now symlinked into /usr/sbin for easy console access.
  Moved index directives to the http clause per best practice.
  Better validation. New rules. Somme helpful comments.
  Added an early version of a vhost config generator.
  ...
Merge branch 'master' of https://bitbucket.org/ubershiz/lemp into develop