Keep non-mergeable status wording harmony with Github's

Fixes #100 and improve the test.

Wording: 

> NuPIC Status: This pull request contains merge conflicts.  Please merge `numenta:master` into `DR:a-feature` and resolve them.