Catching up to Frug

Fresh GIT from Frug modified for WordPress