Merge branch 'master' into devel
Redoing fix that was somehow backed out?  Closes #18.
Merge branch 'issue18' into devel
Merge branch 'hotfix-issue29' into devel
Fixed #28
Merge branch 'issue28' into devel
Fixes #31, see http://docs.python.org/2/distutils/sourcedist.html#manifest
Merge branch 'issue31' into devel
Bumping to 0.1.5
Merge branch 'devel'