lint fixes
changelog update
Merge pull request #12 from jlambert121/lint_fix

Lint fix
Merge branch 'master' into rake_update