2014-10-01 peter todd dev update
Formatting updates