Testing omit files
Merge branch 'dev' into tests
Tests
tests
Merge branch 'tests' into dev
disable nosetesting