Merge pull request #77 from ShadowSam/master

Fixing config file
Fixed issue with editing subscriptions