Allows user and global plugins to coexist, with user-plugin having precendence; relates to #259
Merge branch 'develop' of github.com:syncany/syncany into develop
Merge branch 'develop' into feature/issue192