Mako stub
Instructions changes
Merge branch 'master' into author_answers

Conflicts:
	data/fileformats/reactions/formats/format_xml.py
query xpath starting nto from root node
Merge branch 'master' into author_answers

Conflicts:
	data/fileformats/reactions/formats/format_xml.py
Roundtrip xml in test vio mako
Merge branch 'master' into author_answers
Mako solution
Mako should respect unicode