Issue #2 Merge changes from civicrm/wordpress
Merge pull request #3 from kcristiano/4.5

Have rolled back and merged this in as that will probably be better - apologies for the confusion.