Added Import timeouts, cleaned up directory listings
Merge pull request #44 from mvankeulen94/cleanup

Added Import timeouts, cleaned up directory listings, added sum operator back