Merge remote-tracking branch 'upstream/develop' into develop
made tests runnable using nose
Merge branch 'nose-tests-for-machine-learning' into develop
Merge pull request #45 from alep/develop

All tests run using nose.