Merge pull request #1 from wegry/master

cleaned things up a bit
Override changes. Added more of the API.
pep-8-ified
added git ignore