updated plex
Merge pull request #12 from bhakimi/master

pull from drewbeer
Merge pull request #11 from drewbeer/master

plex stuff