Merge pull request #1 from diefenbach/master

Pull fresh code from diefenbach's dev tree
Fixed MANIFEST.in
Merge pull request #14 from johngoodleaf/master

Fixed minor error in MANIFEST.in