Merge pull request #40 from wesbos/master

Updating master with my latest work
Additional git operations
Saving state for open folders when data is refreshed. Fixes #41