Adding support for Mou markdown editor (http://mouapp.com)
Divvy Support
Merge pull request #126 from saulshanabrook/patch-1

Divvy Support
Add support for Alfred 2
Added support for Cyberduck
Add support for Dash
Removing alfred support
Following instructions from CONTRIBUTIONS.md
Completing addition of Mou Support
Upstream merge to get fork up to date
Cleaning up some work that was accidentally committed. (+2 squashed commits)
Squashed commits:
[3891d19] More cleanup
[219c443] Change log update
added support for pokerstars
Removed done options
Merge pull request #133 from vitorgalvao/todo-cleanup

Removed done options
TODO: 100% test coverage
Merge branch 'master' of github.com:pzbyszynski/mackup into pzbyszynski-master
Added greeting
Merge branch 'master' of github.com:troupe/mackup into troupe-master

Conflicts:
	CHANGELOG.md
Merge branch 'master' of github.com:jannae/mackup into jannae-master

Conflicts:
	CHANGELOG.md
	mackup.py
Merge branch 'add-pokerstars' of github.com:vitorgalvao/mackup into vitorgalvao-add-pokerstars

Conflicts:
	mackup.py