Revert "Merge branch 'Deitronix-master'"

This reverts commit 6f5097498b2dc4c176674e2209af8fe8f9224cf9, reversing
changes made to 3042d5e561ceb3a77d52f35c407aa86bf47a1d9f.
Dos2unix board.py
Revert "Revert "Merge branch 'Deitronix-master'""

This reverts commit faade960c19c8a91ef5eee135055e093c2787870.

Previous revert cuased too many headaches.
This file should not have made it into previous commit, but it did.
Merge branch 'Deitronix-master'

Conflicts:
	board.py - Better fix for merge conflict. dos2unix
Merge pull request #3 from cavemanpi/master

No really. This one should fix your merge conflict.