Merge branch 'develop' into feature/issue192
Merge develop
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
Add RAID0 plugin, and merge develop
Merge branch 'develop' into feature/issue192
Cont'd review and JavaDoc-ing it a bit; relates to #240 #192