* removing superfluous lines
 * more unite mappings and settings
 * restoring angle bracket map (but not using 'a' alias)