diff --git a/etc/vagrant/bootstrap.sh b/etc/vagrant/bootstrap.sh
index 5d93eadde0c76d8b494b6adba1d8c7b8f3a896b2..13e5601c08957484f43e7f85948012589ed3e0c3 100644
--- a/etc/vagrant/bootstrap.sh
+++ b/etc/vagrant/bootstrap.sh
@@ -1,15 +1,24 @@
 #! /bin/bash
 #############################
-# This bootstrap script installs some build tools and the packages
-#   neo4j, neo4j-spatial, httpd, postgresql, postgis, pgRouting, osmosis, osm2pgrouting
-# into a centos6/fedora19 environment.
-# It can be used in the context of a Vagrantfile to configure a vagrant box.
+# This bootstrap script sets up some build tools and the installs the packages
+#   - geoserver
+#   - httpd
+#   - neo4j
+#   - neo4j-spatial
+#   - postgresql
+#   - postgis
+#   - pgRouting
+#   - osmosis
+#   - osm2pgrouting
+# into a centos6 or centos7 environment (fedora 20 might also work, but is untested).
 #
-# Some data (from the road network of innsbruck) is also downloaded and
-# imported into the databases (neo4j and postgresql)
+# It can be used in the context of a Vagrantfile to configure a vagrant box and all
+# the installations can be configured using global variables (some packages are only
+# installed if their installed flag is set to "true")
 #
-# After various installations, the databases, the httpd server, tomcat
-# (and therefor also geoserver, which is installed as war file) are started
+# Some data (from the road network of innsbruck) is also downloaded (from osm) and
+# imported into the installed databases (neo4j and postgresql)
+# After various installations the installed services are started as well
 ############################
 
 if [ -f "/var/vagrant_provision" ]; then
@@ -28,32 +37,25 @@ fi
 IMPORT_OSMDATA=true
 IMPORT_OSMDATA_CACHED=true
 IMPORT_SCHEDULES=true
-INSTALL_HTTPD=true
 INSTALL_GEOSERVER=false
+INSTALL_HTTPD=true
+INSTALL_ISOCHRONE_LOCAL=false # installs isochrone from vagrant start directory (eclipse project)
+INSTALL_ISOCHRONE_RELEASE=true # installs latest isochrone release from nexus repository
+INSTALL_ISOCHRONE_SNAPSHOT=true # installs latest isochrone snapshot from nexus repository
 INSTALL_NEO4J=false
 INSTALL_NEO4J_SPATIAL=false
 INSTALL_PGROUTING=true
 INSTALL_POSTGIS=true
 INSTALL_POSTGRES=true
 INSTALL_POSTGRES_ADMIN=true
-
-# IS_LOCAL_TEST_DEPLOY will prevent install of projects (can be set using command-line argument)
-# PsiProbe will always be installed if INSTALL_PROJECT_PSIPROBE is true (even when this is set to true)
-IS_LOCAL_TEST_DEPLOY=false
-# will install caniget2 sample project
-INSTALL_PROJECT_CANIGET2=false
-# will install isochrone from vagrant start directory (eclipse project)
-INSTALL_ISOCHRONE_LOCAL=false
-# will install latest isochrone release from nexus repository
-INSTALL_ISOCHRONE_RELEASE=true
-# will install latest isochrone snapshot from nexus repository
-INSTALL_ISOCHRONE_SNAPSHOT=true
+INSTALL_PROJECT_CANIGET2=false # installs caniget2 sample project
 INSTALL_PROJECT_PSIPROBE=true
 
 ############################
 # Ext. argument handling   #
 ############################
 
+IS_LOCAL_TEST_DEPLOY=false # will prevent install of projects if set to true (except for PsiProbe)
 PG_DB_NAME="isochrone"
 PG_DB_USER="@db_username@"
 PG_DB_PASSWORD="@db_password@"