updates
Merge remote-tracking branch 'origin/onug-hackathon' into onug-hackathon

Conflicts:
	pyretic/core/runtime.py
Merge remote-tracking branch 'origin/onug-hackathon' into onug-hackathon