travis ci support
Allow plugin to work if downloaded from github or wordpress (images weren't showing up in admin)
Merge remote-tracking branch 'upstream/master' into myVersion