fix deprecated reference to ui.contains
add swappable plugin and wire it up
indent and add id for swappable plugin
Merge remote-tracking branch 'kyle/master'