General cleanup

Added comment styles, cleaned up some CPT layouts
Manual merge to resolve conflicts
Manual merge to resolve conflicts in NatalieMac-natalie-cleanup [PR #5]