recovering changes
update from live site
adding packed plugin binary
resolving merge conflict by removing vim .un~ files