Needed in order to make `python setup.py bdist_wheel` and `pip install <nupic>.whl` work together, removing workaround in favor of a mocked import
Tests folder refactored
Merge branch 'master' of github.com:numenta/nupic into nupic_test
Merge pull request #36 from rhyolight/nupic_test

Merges in master
Deleted "resources" folder
namespace: "nta" replaced by "nupic"
Remaining code
folder: "nta" replaced by "nupic"
Point SHA to https://github.com/numenta/nupic.core/pull/243
Merge branch 'master' of github.com:numenta/nupic into namespace_nupic

Conflicts:
	.nupic_modules
Merge pull request #1541 from oxtopus/unimportable-node-test

Needed in order to make pip installable wheel
Merge pull request #37 from rhyolight/namespace_nupic

Merging in master to "nta" --> "nupic" namespace change
Merge branch 'master' of github.com:numenta/nupic into nupic_test
Merge pull request #1565 from DavidRagazzi/nupic_dead_code

Cleanup: Deletion of Nupic dead code - "resources" folder
Updated nupic.core dependency.

Now that https://github.com/numenta/nupic.core/pull/243 has been merged,
this points to the new SHA with those namespace changes that correspond
to these changes.
Merge pull request #39 from rhyolight/namespace_nupic

Updates nupic.core dependency.
Merge pull request #38 from rhyolight/nupic_test

Merges in master
Merge pull request #1568 from DavidRagazzi/namespace_nupic

"nta" replaced by "nupic" (namespace and folder)
Merge branch 'master' into nupic_test
Merge pull request #40 from rhyolight/nupic_test

Merges in master