Merge pull request #30 from deebost/master

working with plist
refactored stuff
hmmmm

poop