lint changes
lint changes
Merge pull request #1 from dcrissman/dev

Changes to make lint happy