Merge pull request #57 from kevmoo/master

More locking down, using logging instead of print in API-like things