some fix in init
Merge branch 'master' of github.com:syre/datamining-with-python
Merge branch 'master' of github.com:syre/datamining-with-python
Merge branch 'master' of github.com:syre/datamining-with-python
Merge branch 'master' of github.com:syre/datamining-with-python
small changes
Merge branch 'master' of github.com:syre/datamining-with-python

Conflicts:
	report/datamining.tex