Merge pull request #87 from khawkins/unstable

Changing temporary plugin location for unstable
Updated native template