Merge pull request #3 from sanguineturtle/master

Added __init__.py with import statements and updated .gitignore
changed imports to fit new structure
minor edit
minor edits
minor edits