Renamed -r option to replace from remove. Updated recommended style issues to be more in-line with fish standards.