Fix a screwy merge
Merge branch 'trunk' of github.com:WebDevStudios/Custom-Metaboxes-and-Fields-for-WordPress into trunk