Add gemtc directives
Merge branch 'develop' of https://github.com/DanielReid/addis-core into develop