Merge pull request #18 from xopherdeep/master

Merge with Trunk
Merge pull request #19 from xopherdeep/master

Trunk Merge
Merge pull request #20 from xopherdeep/master

Merge with Fork
Merge pull request #21 from xopherdeep/master

added .php
Merge pull request #22 from xopherdeep/master

updating X bgs full
Merge pull request #25 from XenGenie/master

pull