Link type check should be for string equality,
not identity
Merge branch 'refs/heads/master' into nodenet_sheaves
Link type check should be for string equality,
not identity
Merge branch 'refs/heads/master' into nodenet_sheaves

Conflicts:
	micropsi_core/nodenet/nodenet.py
Moving sensor pull-up to get_voted_activation