Reverted to one database creation script including sample data. Could…

…n't put the sample data in a separate file because this caused issues with triggers

install/UPGRADING

@@ -16,4 +16,4 @@ mysql -u root -p phpip < phpip_upgrade-<timestamp>.sql
 You will be prompted for your mysql root password.
 
 Check the detailed guide at:
-https://code.google.com/p/phpip/wiki/Installing
+https://github.com/jjdejong/phpip/wiki/Installing

install/install-phpip-xenial.sh

@@ -33,12 +33,8 @@ echo "
 ********************************
 Installing database.
 When prompted for a password, enter the MySQL password defined earlier
-********************************
-Creating structure..."
-mysql -u root -p < phpip/install/phpip_skel-current.sql
-echo "
-Importing data..."
-mysql -u root -p phpip < phpip/install/phpip_sample-data.sql
+********************************"
+mysql -u root -p < phpip/install/phpip_sample.sql
 echo "
 Ready to go now. 
 Point your browser to http://phpip.local and login with phpipuser:changeme