Check is_singular() vs is_single() allowing for CPTs.
Remove cleanup for a different PR.
Merge pull request #38 from DrewAPicture/singular

Check is_singular() vs is_single() allowing for CPTs.