#1572 Fixes change in behavior cause by passing resolution as an integer to the scalar encoder.
Update test to match correct scalar encoder behavior.
Merge pull request #1589 from scottpurdy/bucketing

#1572 Fixes change in behavior cause by passing resolution as an integer...
Fix attribute error in TemporalMemoryMonitorMixin
Better formatting of connections
Aligned things
Merge pull request #1592 from chetan51/issue-1591

Fix attribute error in TemporalMemoryMonitorMixin
Using pkg_resources to load local config files.

Includes moving nupic-default.xml and nupic-logging.conf into
nupic/support and loading them with pkg_resources. The default config
file is only loaded with pkg_resources if it is not found with the
NTA_CONF_PATH.
Using 'nupic.support' ns to store config in pkg_resources
Merge pull request #1596 from rhyolight/configuration-pkg-resources

Using pkg_resources to load local config files.
Updating path to nupic-default.xml
Updated comment in logging conf
Merge pull request #1598 from rhyolight/update-testdb

Updating path to nupic-default.xml
Merge branch 'master' of github.com:numenta/nupic into build_extensions

Conflicts:
	setup.py
Updates to latest core SHA
Merge branch 'update-core-manual' into build_extensions
Merge branch 'build_extensions' of github.com:DavidRagazzi/nupic into build_extensions
Merge pull request #42 from rhyolight/build_extensions

Manual merge of master