Merge pull request #1367 from palantir/tslintFixes

Resolving tslint complaints