Updating salt configuration to work with a local Vagrant build
Merge branch 'Edgar_On_Rails' of github.com:jcu-eresearch/Edgar into Edgar_On_Rails