turned custom post type setting off by default, fixed more incude statements
fixed broken require include statements
updated default settings
fixed broken logger
fixed broken require statement
fixed broken require statement second time's the charm
set default video player to none
add backwards support for video js player. Removed video js as option for video player. All future clients will use Atlantis
missing comma
fixing merge conflicts
fixing merge coonflicts