Merge branch 'humbucker' of git://github.com/blueriver/MuraCMS into humbucker
Merge branch 'humbucker' of github.com:stevewithington/MuraCMS into humbucker