Revert back to SnipMate since UltiSnips is ew no
Added Unite and updated Adam's tab complete macro