Move bpython reliance to main.py
Merge remote-tracking branch 'upstream/master'
Merge remote-tracking branch 'upstream/master'

Conflicts:
	calculon/display.py
Fixed CLIRepl refs