added new binned class, adjusted the unittests, corrected imports
Merge branch 'master' of https://github.com/paulchorley/elephant into hbp_review