Fix for Profile Options not Fully Merging#40

jayclassless wants to merge 2 commits into

prospector-dev:masterprospector-dev/prospector:masterfrom

jayclassless:profile_merge_fixesCopy head branch name to clipboard