Updated src, and plugapi repo url.
Resolved merge conflict..I hope.