More formatting fixes.
Merge branch '2.0-UNSTABLE' of https://github.com/jjon-saxton/momoko-cms into 2.0-UNSTABLE