remove extraneous white-space
Merge branch 'mikedev'