Update css parsing to Binky functions and improve php strictness
Merge remote-tracking branch 'origin/master'