add alias for markdown editor
merge conflicted aliases
Fixes the profiles-plugin

An error was introduced with 7f75bb9, which uses special vars. This is the
fix.
Merge pull request #3299 from apoxa/fix-profiles

Fix for the profile plugin.
replace mac base sed as GNU sed
merge conflict
Merge remote-tracking branch 'upstream/master' into dev