Merge tag 'shogun_4.1.0'

Author: lisitsyn

.gitignore

@@ -125,6 +125,13 @@ cpplint.py
 /tests/unit/*.hdf5
 /tests/unit/*.json
 /tests/unit/combined_kernel.weights
+Testing/
+examples/undocumented/python_modular/serialized_svm.bz2
+examples/undocumented/python_modular/tmp/blaah.asc
+examples/undocumented/python_modular/tmp/blaah.h5
+examples/undocumented/python_modular/tmp/blaah.json
+examples/undocumented/python_modular/tmp/blaah.xml
+examples/undocumented/python_modular/vw_cache.dat.cache
 
 # cmake
 /CMakeFiles/

.gitmodules

@@ -5,6 +5,3 @@
 [submodule "doc/tutorial"]
 	path = doc/tutorial
 	url = git://github.com/shogun-toolbox/shogun-tutorial.git
-[submodule "doc/md"]
-	path = doc/md
-	url = git://github.com/shogun-toolbox/shogun.wiki.git

.travis.yml

@@ -100,7 +100,7 @@ install:
   - if [ -z $OSX ] ; then
       sudo apt-get install -qq libbz2-dev cdbs libarpack2-dev libatlas-base-dev libblas-dev libglpk-dev libhdf5-serial-dev zlib1g-dev libxml2-dev libreadline6-dev libreadline-dev libsnappy-dev liblzo2-dev liblzma-dev liblapack-dev libeigen3-dev libjson-c-dev libnlopt-dev gdb cmake python-jinja2 ccache $EXTRA_PACKAGES ;
     else
-      brew install ccache eigen json-c;
+      brew install ccache eigen;
     fi
   - eval $CUSTOM_PKG
   - if [[ $TRAVIS_PYTHON_VERSION == '3.3' ]] ; then conda create -n testenv python=$TRAVIS_PYTHON_VERSION numpy scipy && source activate testenv ; fi