Shuffle - rebase to allow fixes and have restructuring code on top

reorders commits in #nupic.core@master 

keeps existing state of master/HEAD + #54 #55 PRs
David's code for restructuring is placed on the top (because nupic does not use it yet)