Added option for annotation tooltip to be floating (follows mouse, current functionality) or fixed (stationary per annotation).
Review changes
Merge branch 'master' of https://github.com/ajaxorg/ace into stationary_tooltip_option
Added cfml behaviour with smart auto closing tags

This adds the behaviours for ColdFusion Markup Language (CFML) back in
with the addition of exceptions for auto-closing tags.
Fixed token name and added to self-closing tags list
Merge remote-tracking branch 'remotes/pull/1758'
fix merge conflict
cleanup user list
Merge remote-tracking branch 'remotes/origin/master'