Added support for Dolphin
Added support for rTorrent
Merge pull request #198 from mgalkiewicz/master

Added support for rTorrent
Merge branch 'dolphin' of github.com:lachlancooper/mackup into lachlancooper-dolphin

Conflicts:
	CHANGELOG.md
Improved Janus support for Vim
Do not sync Dash Docsets anymore. Fix #196
Added support for Lightroom 5 (just the plist file missing)
Added support for Adobe Camera Raw
Merge pull request #199 from Darep/lightroom5-plist

Added support for Lightroom 5 (plist file was missing)
Merge branch 'adobe-camera-raw' of github.com:Darep/mackup into Darep-adobe-camera-raw

Conflicts:
	CHANGELOG.md
Merge branch 'master' into mylocal

Conflicts:
	mackup.py