Merge pull request #81 from DirtyF/4.2

Not PHP 5.4 ready yet
Remove Google Chrome Frame option