Fixed trailing whitespace and indentation checkstyle warnings
Merge pull request #147 from InMobi/whitespace

Fixed trailing whitespace and indentation checkstyle warnings