Merge branch 'next' into Vbar_TxPID
Merge branch 'Vbar_TxPID' of https://github.com/KipK/TauLabs into Vbar_TxPID
Wrapped the values in txpidsettings.xml to make it more readable.