Started work on the multi-config branch
First and last version of multi config, merge -> master
Merge branch 'multiConfig'
Merge branch 'master' of github.com:jamesread/upsilon