pulling in files from ryan's code
fixing the copy error, getting tests to pass
removing directory check since it prevents the theme from updating