Merge pull request #12 from sedley/master

Updating GUI with latest functional code to allow for cleanup
Testing gui placment
Update scanner.py
Merge pull request #16 from sedley/gui

Bringing import into the most up-to-date code base
numerous changes