Merge branch 'master' of https://github.com/ericmichael/whales

Conflicts:
	devio.py
Merge branch 'master' of https://github.com/ericmichael/whales