Fix doubly applied basepaths to lockfiles.
Merge pull request #163 from dandersson/fix_lock_path

Fix doubly applied basepaths to lockfiles.
minor: remove an unnecessary quotation mark
Merge pull request #166 from supahgreg/master

Removing a quotation mark
special version reporting for git
Merge branch 'master' of github.com:gothfox/Tiny-Tiny-RSS
Merge branch 'master' of git://github.com/gothfox/Tiny-Tiny-RSS into upstream-master