Proper console_scripts entry points while maintining the old 'bin' for p...

...ackaging compatability

Issue #1841