Cleaned-up CLI options and updated Gemspec name