some minor edits
Merge branch 'master' of github.com:bapsmith/CAN-Python
Merge branch 'master' of https://github.com/bapsmith/CAN-Python

Conflicts:
	canpython.py