Merging changes from Aaron's repo including changing variables to fix problem with framework name being used as project name