4.1.0 prep
Merge pull request #519 from mhaskel/4.1.0-prep

4.1.0 prep
Fix errors with future parser
Merge pull request #520 from mhaskel/future_parser_fix

Fix errors with future parser
Let's actually have the version number
Merge pull request #525 from mhaskel/changelog_fix

Let's actually have the version number
Merge pull request #526 from mhaskel/test

merge 4.1.x into master