config additions
Merge pull request #313 from NICTA/config

config additions