2.4 adjustments and corrections
Adding comment to the APIInfo change
Removing vim .swp
Merge pull request #26 from kwoodson/master

Fixes for compatibility with 2.4