port importgit
Merge branch 'master' of github.com:stevedh/readingdb

Conflicts:
	iface_bin/import.py
Merge branch 'master' of github.com:stevedh/readingdb
Merge branch 'master' of github.com:stevedh/readingdb
* Fix linux build (what to do about mac)