Merge pull request #3 from JeremiahDJordan/master

Refactor and cleanup
Fix pulling off full file name extension when people add extra periods
Fix bz2. Add 7z. Fix files with extra . in them.