Remove unnecessary cherry pick (already merged)

also some whitespace nits vim pointed out
Merge pull request #28 from marios/merged_patches

Remove unnecessary cherry pick (already merged)