Merge branch 'master' into numerics

.gitmodules

 [submodule "openfpm_vcluster"]
 	path = openfpm_vcluster
-	url = ssh://git@ppmcoremirror.dynu.com:2222/incardon/openfpm_vcluster.git
+	url = ssh://git@ppmcore.mpi-cbg.de/incardon/openfpm_vcluster.git
 [submodule "openfpm_devices"]
 	path = openfpm_devices
-	url = ssh://git@ppmcoremirror.dynu.com:2222/incardon/openfpm_devices.git
+	url = ssh://git@ppmcore.mpi-cbg.de/incardon/openfpm_devices.git
 [submodule "openfpm_io"]
 	path = openfpm_io
-	url = ssh://git@ppmcoremirror.dynu.com:2222/incardon/openfpm_io.git
+	url = ssh://git@ppmcore.mpi-cbg.de/incardon/openfpm_io.git
 [submodule "openfpm_data"]
 	path = openfpm_data
-	url = ssh://git@ppmcoremirror.dynu.com:2222/incardon/openfpm_data.git
+	url = ssh://git@ppmcore.mpi-cbg.de/incardon/openfpm_data.git
 [submodule "openfpm_numerics"]
 	path = openfpm_numerics
-	url = ssh://git@ppmcoremirror.dynu.com:2222/incardon/openfpm_numerics.git
+	url = ssh://git@ppmcore.mpi-cbg.de/incardon/openfpm_numerics.git

install

@@ -42,6 +42,10 @@ discover_os
 
 ## Remove old dependencies and installations
 
+if [ x"$i_dir" == x" " ]; then
+ i_dir="$HOME"
+fi
+
 remove_old $i_dir
 
 ## Check and try to install the prerequisites
@@ -68,7 +72,6 @@ cd openfpm_data
 if [ ! -d src/config  ]; then
   mkdir src/config
 fi
-git checkout develop
 cd ..
 
 cd openfpm_devices
@@ -105,10 +108,6 @@ fi
 
 ## check for options
 
-if [ x"$i_dir" == x" " ]; then
- i_dir="$HOME"
-fi
-
 echo -e "\033[1;34;5mDEPENCENCIES INSTALLATION DIR      \033[0m"
 echo -e "Every required dependencies if needed will be installed into: \033[1;34;5m$i_dir\033[0m"
 echo -e "if you want to install somewhere else do ./install -i /somewhere/else"

script/remove_old

@@ -5,7 +5,7 @@ function remove_old()
     ## Get the previos openFPM installation
     previous_inst=$(cat $PWD/install_dir)
     
-    if [ x"$previous_inst"!=x"" ]; then
+    if [ x"$previous_inst" != x"" ]; then
         echo "Found previous installation"
         if [ -d "$previous_inst/openfpm_pdata" ]; then
             echo "Removing the folder: $previous_inst/openfpm_pdata"
@@ -76,7 +76,7 @@ function remove_old()
     ## Check the installed version of the dependencies
     
     is_update=$(cat $1/BOOST/include/boost/version.hpp | grep "#define BOOST_VERSION 106000")
-    if [ x"$is_update"==x"" ]; then
+    if [ x"$is_update" == x"" ]; then
     	echo "New boost version, removing the old one"
         rm -rf $1/BOOST/include
         rm -rf $1/BOOST/lib