Feature/ajw sge swap

This is to merge the work on variable substitution and simplication of Bindle back into develop.