Merge branch 'master' into russell/attribution

Conflicts:
	lib/DDG/Goodie/MD5.pm
	lib/DDG/Goodie/MakeMeASandwich.pm
	lib/DDG/Goodie/MoonPhases.pm
	lib/DDG/Goodie/Morse.pm
	lib/DDG/Goodie/NLetterWords.pm

lib/DDG/Goodie/MD5.pm

@@ -20,7 +20,7 @@ code_url 'https://github.com/duckduckgo/zeroclickinfo-goodies/blob/master/lib/DD
 category 'calculations';
 topics 'cryptography';
 attribution web => ['http://www.guttula.com', 'Jarmo Kivekäs'],
-            github => [ 'jarmokivekas', 'Jarmo Kivekäs'];
+            github => ['jarmokivekas', 'Jarmo Kivekäs'];
 
 
 triggers startend => 'md5', 'md5sum';

lib/DDG/Goodie/MakeMeASandwich.pm

@@ -11,7 +11,7 @@ category 'special';
 topics 'geek';
 code_url 'https://github.com/duckduckgo/zeroclickinfo-goodies/blob/master/lib/DDG/Goodie/MakeMeASandwich.pm';
 attribution twitter => ['mattr555', 'Matt Ramina'],
-            github => ['https://github.com/mattr555/', 'Matt Ramina'];
+            github => ['mattr555', 'Matt Ramina'];
 
 triggers end => 'make me a sandwich';
 

lib/DDG/Goodie/MoonPhases.pm

@@ -14,7 +14,9 @@ name "MoonPhases";
 topics "special_interest", "everyday";
 category "random";
 
-attribution github  => ['https://github.com/rpicard', 'Robert Picard'];
+attribution github  => ['rpicard', 'Robert Picard'],
+            twitter => ['__rlp', 'Robert Picard'],
+            web     => ['http://robert.io', 'Robert Picard'];
 
 
 triggers any => 'moon', 'lunar';

lib/DDG/Goodie/Morse.pm

@@ -12,8 +12,8 @@ code_url 'https://github.com/duckduckgo/zeroclickinfo-goodies/blob/master/lib/DD
 category 'conversions';
 topics 'special_interest';
 attribution web     => ['http://und3f.com', 'und3f'],
-            twitter => 'und3f',
-            github  => 'und3f',
+            twitter => ['und3f', 'und3f'],
+            github  => ['und3f', 'und3f'],
             cpan    => ['UNDEF', 'und3f'];
 
 triggers startend => 'morse', 'morse code';

lib/DDG/Goodie/NLetterWords.pm

@@ -15,7 +15,7 @@ name 'NLetterWords';
 code_url 'https://github.com/duckduckgo/zeroclickinfo-goodies/blob/master/lib/DDG/Goodie/NLetterWords.pm';
 topics 'words_and_games';
 category 'language';
-attribution github => ['http://github.com/nospampleasemam', 'Dylan Lloyd'],
+attribution github => ['nospampleasemam', 'Dylan Lloyd'],
             web => ['http://dylansserver.com/', 'Dylan Lloyd'];
 
 handle query_parts => sub {

lib/DDG/Goodie/POTUS.pm

@@ -18,8 +18,8 @@ category 'reference';
 topics 'trivia';
 primary_example_queries 'potus 16';
 code_url 'https://github.com/duckduckgo/zeroclickinfo-goodies/blob/master/lib/DDG/Goodie/POTUS.pm';
-attribution github  => ['https://github.com/numbertheory', 'John-Peter Etcheber'],
-            twitter => ['http://twitter.com/jpscribbles', 'John-Peter Etcheber'];
+attribution github  => ['numbertheory', 'John-Peter Etcheber'],
+            twitter => ['jpscribbles', 'John-Peter Etcheber'];
 
 my @presidents = @{Load(scalar share('presidents.yml')->slurp)};
 my $prez_count = scalar @presidents;

lib/DDG/Goodie/Paper.pm

@@ -17,9 +17,9 @@ code_url
     'https://github.com/duckduckgo/zeroclickinfo-goodies/blob/master/lib/DDG/Goodie/Paper.pm';
 category 'conversions';
 topics 'special_interest';
-attribution github => 'loganom',
-            twitter => 'loganmccamon',
-            github => 'mattlehnig';
+attribution github => ['loganom', 'Logan McCamon'],
+            twitter => ['loganmccamon', 'Logan McCamon'],
+            github => ['mattlehnig', 'Matt Lehnig'];
 
 my $sizes = Load(scalar share('sizes.yml')->slurp);
 

lib/DDG/Goodie/Parcelforce.pm

@@ -16,8 +16,8 @@ code_url
 category 'ids';
 topics 'special_interest';
 attribution
-    github  => [ 'https://github.com/TopHattedCoder', 'Tom Bebbington' ],
-    twitter => [ 'http://twitter.com/TopHattedCoder', 'TopHattedCoder' ];
+    github  => [ 'TopHattedCoder', 'Tom Bebbington' ],
+    twitter => [ 'TopHattedCoder', 'Tom Bebbington' ];
 
 # Regex for parcelforce / royal mail
 my $rm_qr = qr/royalmail|parcelforce/io;

lib/DDG/Goodie/ParseCron.pm

@@ -23,8 +23,8 @@ name 'ParseCron';
 code_url 'https://github.com/duckduckgo/zeroclickinfo-goodies/blob/master/lib/DDG/Goodie/ParseCron.pm';
 category 'computing_info';
 topics 'sysadmin';
-attribution web     => [ 'http://indeliblestamp.com', 'Arun S' ],
-            github  => [ 'http://github.com/indeliblestamp', 'IndelibleStamp' ] ;
+attribution web     => ['http://indeliblestamp.com', 'Arun S'],
+            github  => ['indeliblestamp', 'Arun S'];
 
 handle remainder => sub {
     my $crontab = $_;

lib/DDG/Goodie/Passphrase.pm

@@ -13,7 +13,7 @@ code_url 'https://github.com/duckduckgo/zeroclickinfo-goodies/blob/master/lib/DD
 category 'computing_tools';
 topics 'cryptography';
 
-attribution github => ['https://github.com/hunterlang', 'hunterlang'];
+attribution github => ['hunterlang', 'Hunter Lang'];
 
 triggers startend => 'passphrase', 'pass phrase', 'random passphrase', 'passphrase random', 'random pass phrase', 'pass phrase random';
 

lib/DDG/Goodie/Password.pm

@@ -11,7 +11,7 @@ primary_example_queries 'random password', 'random password strong 15';
 description 'generates a random password';
 name 'Password';
 code_url 'https://github.com/duckduckgo/zeroclickinfo-goodies/blob/master/lib/DDG/Goodies/Password.pm';
-attribution github => ['https://github.com/duckduckgo', 'duckduckgo'];
+attribution github => ['duckduckgo', 'DuckDuckGo'];
 category 'computing_tools';
 topics 'cryptography';
 

lib/DDG/Goodie/PercentError.pm

@@ -15,8 +15,8 @@ name 'PercentError';
 code_url 'https://github.com/duckduckgo/zeroclickinfo-goodies/blob/master/lib/DDG/Goodie/PercentError.pm';
 category 'calculations';
 topics 'math';
-attribution twitter => 'crazedpsyc',
-            cpan    => 'CRZEDPSYC' ;
+attribution twitter => ['crazedpsyc', 'Michael Smith'],
+            cpan    => ['CRZEDPSYC', 'Michael Smith'];
 
 handle remainder => sub {
     my $length = length($_);

lib/DDG/Goodie/Perimeter.pm

@@ -15,8 +15,8 @@ name 'Perimeter';
 code_url 'https://github.com/duckduckgo/zeroclickinfo-goodies/blob/master/lib/DDG/Goodie/Perimeter.pm';
 category 'calculations';
 topics 'math';
-attribution twitter => 'crazedpsyc',
-            cpan    => 'CRZEDPSYC' ;
+attribution twitter => ['crazedpsyc', 'Michael Smith'],
+            cpan    => ['CRZEDPSYC', 'Michael Smith'];
 
 handle query_lc => sub {
     if ($_ =~ m/^(?:circumference (?:of\s|)(?:circle\s|)(\d+(?:\.\d+)?))|(?:(perimeter) (?:of\s|)(?:(square|circle|pentagon|hexagon|octagon) (\d+(?:\.\d+)?)|(rectangle) (\d+(?:\.\d+)?)[,;]?\s(\d+(?:\.\d+)?)|(triangle) (\d+(?:\.\d+)?)[,;]?\s(\d+(?:\.\d+)?)[,;]?\s(\d+(?:\.\d+)?)))$/) {

lib/DDG/Goodie/Phonetic.pm

@@ -13,8 +13,8 @@ name 'Phonetic';
 code_url 'https://github.com/duckduckgo/zeroclickinfo-goodies/blob/master/lib/DDG/Goodie/Phonetic.pm';
 category 'reference';
 topics 'special_interest';
-attribution github    => [ 'http://github.com/robotmay', 'Robert May' ],
-            twitter => [ 'http://twitter.com/robotmay', 'robotmay' ];
+attribution github    => [ 'robotmay', 'Robert May' ],
+            twitter => [ 'robotmay', 'Robert May' ];
 
 sub components {
     my %nato = (

lib/DDG/Goodie/PigLatin.pm

@@ -9,8 +9,8 @@ triggers startend => 'pig latin', 'piglatin';
 zci answer_type => "translation";
 zci is_cached   => 1;
 
-attribution github => ['http://github.com/nospampleasemam', 'nospampleasemam'],
-            web    => ['http://github.com/nospampleasemam', 'nospampleasemam'];
+attribution github => ['nospampleasemam', 'Dylan Lloyd'],
+            web    => ['nospampleasemam', 'Dylan Lloyd'];
 
 primary_example_queries 'pig latin i love duckduckgo';
 name 'PigLatin';

lib/DDG/Goodie/Poker.pm

@@ -14,7 +14,7 @@ description 'returns requested statistic of the requested poker hand';
 name 'Poker';
 topics 'gaming', 'entertainment';
 category 'random';
-attribution github => [ 'https://github.com/austinheimark', 'austin_heimark' ];
+attribution github => [ 'austinheimark', 'Austin Heimark' ];
 
 my %odds = (
 	"royal flush" => "649,739",

lib/DDG/Goodie/PrimeFactors.pm

@@ -28,7 +28,7 @@ description 'Returns the prime factors of the entered number';
 name 'PrimeFactors';
 topics 'math';
 category 'calculations';
-attribution github => [ 'https://github.com/austinheimark', 'austin_heimark' ];
+attribution github => [ 'austinheimark', 'Austin Heimark' ];
 
 # This adds exponents to the prime numbers.
 # It outputs both text and HTML:

lib/DDG/Goodie/PrivateNetwork.pm

@@ -15,8 +15,8 @@ name 'PrivateNetwork';
 code_url 'https://github.com/duckduckgo/zeroclickinfo-goodies/blob/master/lib/DDG/Goodie/PrivateNetwork.pm';
 category 'cheat_sheets';
 topics 'sysadmin';
-attribution twitter => 'crazedpsyc',
-            cpan    => 'CRZEDPSYC' ;
+attribution twitter => ['crazedpsyc', 'Michael Smith'],
+            cpan    => ['CRZEDPSYC', 'Michael Smith'];
 
 my $text = scalar share('private_network.txt')->slurp,
 my $html = scalar share('private_network.html')->slurp;

lib/DDG/Goodie/PublicDNS.pm

@@ -13,7 +13,7 @@ code_url 'https://github.com/duckduckgo/zeroclickinfo-goodies/blob/master/lib/DD
 category 'cheat_sheets';
 topics 'sysadmin';
 
-attribution github => ['https://github.com/warthurton', 'warthurton'];
+attribution github => ['warthurton', 'Wayne Arthurton'];
 
 triggers end => "public dns", "dns server", "dns servers";
 

lib/DDG/Goodie/Rafl.pm

@@ -13,8 +13,8 @@ code_url 'https://github.com/duckduckgo/zeroclickinfo-goodies/blob/master/lib/DD
 category 'ids';
 topics 'social';
 
-attribution web     => 'http://stephen.scaffidi.net',
-            github  => ['https://github.com/Hercynium', 'Hercynium'];
+attribution web     => ['http://stephen.scaffidi.net', 'Stephen R. Scaffidi'],
+            github  => ['Hercynium', 'Stephen R. Scaffidi'];
 
 triggers any => 'rafl';
 

lib/DDG/Goodie/Randagram.pm

@@ -16,7 +16,7 @@ code_url "https://github.com/duckduckgo/zeroclickinfo-goodies/blob/master/lib/DD
 category "transformations";
 topics "words_and_games";
 
-attribution github => ["https://github.com/crazedpsyc", "crazedpsyc"];
+attribution github => ["crazedpsyc", "Michael Smith"];
 
 handle remainder => sub {
     s/^of\s(.*)/$1/i;

lib/DDG/Goodie/RandomName.pm

@@ -12,8 +12,8 @@ topics 'words_and_games';
 primary_example_queries 'random name';
 secondary_example_queries 'random person';
 code_url 'https://github.com/duckduckgo/zeroclickinfo-goodies/blob/master/lib/DDG/Goodie/RandomName.pm';
-attribution github  => ['https://github.com/stelim', 'Stefan Limbacher'],
-            twitter => ['http://twitter.com/stefanlimbacher', 'Stefan Limbacher'];
+attribution github  => ['stelim', 'Stefan Limbacher'],
+            twitter => ['stefanlimbacher', 'Stefan Limbacher'];
 
 triggers start  => 'random name','random person';
 zci answer_type => "randomname";

lib/DDG/Goodie/RandomNumber.pm

@@ -9,7 +9,7 @@ name 'RandomNumber';
 code_url 'https://github.com/duckduckgo/zeroclickinfo-goodies/blob/master/lib/DDG/Goodies/RandomNumber.pm';
 category 'computing_tools';
 topics 'cryptography';
-attribution github => ['https://github.com/duckduckgo', 'duckduckgo'];
+attribution github => ['duckduckgo', 'DuckDuckGo'];
 
 zci answer_type => 'rand';
 zci is_cached   => 0;

lib/DDG/Goodie/RegexCheatSheet.pm

@@ -41,7 +41,7 @@ triggers start =>
 
 triggers end => "regex", "regexp";
 
-attribution github => ['https://github.com/mintsoft', 'mintsoft'];
+attribution github => ['https://github.com/mintsoft', 'Rob Emery'];
 primary_example_queries 'regex';
 secondary_example_queries 'regexp $';
 category 'computing_tools';

lib/DDG/Goodie/Regexp.pm

@@ -15,8 +15,8 @@ code_url 'https://github.com/duckduckgo/zeroclickinfo-goodies/blob/master/lib/DD
 category 'computing_tools';
 topics 'programming', 'sysadmin';
 attribution web => [ 'https://www.duckduckgo.com', 'DuckDuckGo' ],
-            github => [ 'https://github.com/duckduckgo', 'duckduckgo'],
-            twitter => ['http://twitter.com/duckduckgo', 'duckduckgo'];
+            github => [ 'duckduckgo', 'DuckDuckGo'],
+            twitter => ['duckduckgo', 'DuckDuckGo'];
 
 triggers query_lc => qr/^regex[p]? [\/\\](.+?)[\/\\] (.+)$/i;
 

lib/DDG/Goodie/ResistorColors.pm

@@ -28,7 +28,7 @@ category 'reference';
 topics 'science';
 
 attribution twitter => 'joewalnes',
-            web => ['http://joewalnes.com', 'joewalnes.com'],
+            web => ['http://joewalnes.com', 'Joe Walnes'],
             email => ['joe@walnes.com', 'Joe Walnes'],
             github => ["https://github.com/HackOrQuack", "HackOrQuack"];
 

lib/DDG/Goodie/Reverse.pm

@@ -10,7 +10,8 @@ code_url 'https://github.com/duckduckgo/zeroclickinfo-goodies/blob/master/lib/DD
 category 'transformations';
 topics 'words_and_games';
 
-attribution github => ['https://github.com/Getty', 'Getty'], cpan => 'GETTY';
+attribution github => ['https://github.com/Getty', 'Torsten Raudssus'], 
+            cpan => ['GETTY', 'Torsten Raudssus'];
 
 triggers startend => "reverse text";
 

lib/DDG/Goodie/ReverseComplement.pm

@@ -15,7 +15,7 @@ primary_example_queries 'revcomp AAAACCCGGT';
 category 'transformations';
 topics 'science';
 code_url 'https://github.com/duckduckgo/zeroclickinfo-goodies/blob/master/lib/DDG/Goodie/ReverseComplement.pm';
-attribution github => ['http://github.com/wilkox', 'wilkox'];
+attribution github => ['http://github.com/wilkox', 'David Wilkins'];
 
 handle remainder => sub {
 

lib/DDG/Goodie/Roman.pm

@@ -4,6 +4,7 @@ package DDG::Goodie::Roman;
 use DDG::Goodie;
 
 use Roman;
+use utf8;
 
 primary_example_queries 'roman numeral MCCCXXXVII';
 secondary_example_queries 'roman 1337', 'roman IV';
@@ -13,7 +14,7 @@ code_url 'https://github.com/duckduckgo/zeroclickinfo-goodies/blob/master/lib/DD
 category 'conversions';
 topics 'cryptography';
 
-attribution github => ['https://github.com/mrshu', 'mrshu'];
+attribution github => ['mrshu', 'Marek Šuppa'];
 
 triggers any => "roman", "arabic";
 

lib/DDG/Goodie/Rot13.pm

@@ -11,7 +11,7 @@ code_url 'https://github.com/duckduckgo/zeroclickinfo-goodies/blob/master/lib/DD
 category 'transformations';
 topics 'cryptography';
 
-attribution github => ['https://github.com/unlisted', 'unlisted'];
+attribution github => ['unlisted', 'Morgan'];
 
 triggers start => 'rot13';
 

lib/DDG/Goodie/RouterPasswords.pm

@@ -10,7 +10,7 @@ name 'RouterPasswords';
 code_url 'https://github.com/duckduckgo/zeroclickinfo-goodies/blob/master/lib/DDG/Goodie/RouterPasswords.pm';
 topics 'sysadmin';
 category 'computing_tools';
-attribution github => ['http://github.com/nospampleasemam', 'nospampleasemam'],
+attribution github => ['nospampleasemam', 'Dylan Lloyd'],
             web => ['http://dylansserver.com/', 'Dylan Lloyd'];
 
 my %routers = (

lib/DDG/Goodie/RubiksCubePatterns.pm

@@ -12,7 +12,9 @@ code_url 'https://github.com/duckduckgo/zeroclickinfo-goodies/blob/master/lib/DD
 category 'random';
 topics 'special_interest';
 source 'http://math.cos.ucf.edu/~reid/Rubik/patterns.html';
-attribution web => ['robert.io', 'Robert Picard'], twitter => '__rlp', github => ['https://github.com/rpicard', 'rpicard'];
+attribution web => ['robert.io', 'Robert Picard'], 
+            twitter => ['__rlp', 'Robert Picard'], 
+            github => ['rpicard', 'Robert Picard'];
 
 triggers start =>	"rcube", "rubik", "rubiks", "rubix",
 					"rubicks", "rubik's", "rubic's", "rubick's",

lib/DDG/Goodie/Sha.pm

@@ -15,8 +15,8 @@ code_url 'https://github.com/duckduckgo/zeroclickinfo-goodies/blob/master/lib/DD
 category 'calculations';
 topics 'cryptography';
 attribution web => [ 'https://www.duckduckgo.com', 'DuckDuckGo' ],
-            github => [ 'https://github.com/duckduckgo', 'duckduckgo'],
-            twitter => ['http://twitter.com/duckduckgo', 'duckduckgo'];
+            github => [ 'duckduckgo', 'DuckDuckGo'],
+            twitter => ['duckduckgo', 'DuckDuckGo'];
 
 
 triggers query => qr/^

lib/DDG/Goodie/Shortcut.pm

@@ -2,6 +2,7 @@ package DDG::Goodie::Shortcut;
 # ABSTRACT: Display keyboard shortcut for an action.
 
 use DDG::Goodie;
+use utf8;
 
 triggers any => 'shortcut','keyboard shortcut', 'key combination';
 
@@ -14,9 +15,9 @@ description 'Keyboard shortcuts';
 name 'Shortcut';
 topics 'computing';
 category 'computing_info';
-attribution github => ['https://github.com/dariog88a','dariog88a'],
-            email => [ 'mailto:dariog88@gmail.com', 'dariog88' ],
-            twitter => ['http://twitter.com/dariog88','dariog88'];
+attribution github => ['dariog88a','Darío'],
+            email => [ 'dariog88@gmail.com', 'Darío' ],
+            twitter => ['dariog88', 'Darío'];
 
 my @shortcuts = share('shortcuts.csv')->slurp(iomode => '<:encoding(UTF-8)');
 

lib/DDG/Goodie/SigFigs.pm

@@ -11,7 +11,7 @@ code_url 'https://github.com/duckduckgo/zeroclickinfo-goodies/blob/master/lib/DD
 category 'calculations';
 topics 'math';
 
-attribution github => ['https://github.com/hunterlang', 'hunterlang'];
+attribution github => ['hunterlang', 'Hunter Lang'];
 
 triggers start => 'sigfigs', 'sigdigs', 'sf', 'sd', 'significant';
 

lib/DDG/Goodie/Sort.pm

@@ -23,7 +23,7 @@ name 'Sort';
 code_url 'http://github.com/koosha--';
 category 'computing_tools';
 topics 'programming';
-attribution github  => ['https://github.com/koosha--', 'koosha--'],
+attribution github  => ['koosha--', 'Koosha K. M.'],
             twitter => '_koosha_';
 
 my $delim = ', ';

lib/DDG/Goodie/SubnetCalc.pm

@@ -13,7 +13,7 @@ triggers query => qr#^([0-9]{1,3}\.){3}([0-9]{1,3})[\s/](([1-3]?[0-9])|(([0-9]{1
 zci answer_type => "subnet_info";
 zci is_cached => 1;
 
-attribution github => ['https://github.com/mintsoft', 'mintsoft'];
+attribution github => ['mintsoft', 'Rob Emery'];
 
 primary_example_queries '10.92.24.0/22';
 secondary_example_queries '46.51.197.88 255.255.254.0', '176.34.131.233/32';

lib/DDG/Goodie/Sudoku.pm

@@ -17,7 +17,7 @@ description 'show a little sudoku you can play in the browser';
 
 name 'Sudoku';
 category 'random';
-attribution github => ['https://github.com/DrDub', 'DrDub'],
+attribution github => ['DrDub', 'Pablo Duboue'],
 	web => ['http://duboue.net/', 'Pablo Duboue'],
 	github => ['https://github.com/mintsoft', 'Rob Emery'];
 

lib/DDG/Goodie/SumOfNaturalNumbers.pm

@@ -17,8 +17,8 @@ name 'SumOfNaturalNumbers';
 code_url 'https://github.com/duckduckgo/zeroclickinfo-goodies/blob/master/lib/DDG/Goodie/SumOfNaturalNumbers.pm';
 category 'calculations';
 topics 'math';
-attribution github => ['https://github.com/JulianGindi', 'JulianGindi'],
-            github => ['https://github.com/navneet35371', 'navneet35371'];
+attribution github => ['JulianGindi', 'Julian Gindi'],
+            github => ['navneet35371', 'Navneet Suman'];
 
 # This adds commas to the number.
 # It converts 10000000 to 10,000,000.

lib/DDG/Goodie/SunInfo.pm

@@ -18,7 +18,7 @@ description 'Compute the sunrise and sunset for a given day';
 code_url 'https://github.com/duckduckgo/zeroclickinfo-goodies/blob/master/lib/DDG/Goodie/SunInfo.pm';
 category 'calculations';
 topics 'everyday';
-attribution github => ['https://github.com/duckduckgo', 'duckduckgo'];
+attribution github => ['duckduckgo', 'DuckDuckGo'];
 
 my $time_format      = '%l:%M %p';
 my $datestring_regex = datestring_regex();

lib/DDG/Goodie/Teredo.pm

@@ -15,9 +15,9 @@ name 'Teredo extractor';
 code_url 'https://github.com/duckduckgo/zeroclickinfo-goodies/blob/master/lib/DDG/Goodie/Teredo.pm';
 topics 'sysadmin';
 category 'transformations';
-attribution github => ['https://github.com/seanheaton','seanheaton'],
-	twitter => ['http://twitter.com/seanograph','@seanograph'],
-	email => ['mailto:seanoftime@gmail.com','seanoftime@gmail.com'];
+attribution github => ['seanheaton','Sean Heaton'],
+            twitter => ['seanograph','Sean Heaton'],
+            email => ['seanoftime@gmail.com','seanoftime@gmail.com'];
 
 zci answer_type => 'teredo';
 zci is_cached   => 1;

lib/DDG/Goodie/TimezoneConverter.pm

@@ -9,7 +9,7 @@ use DDG::Goodie;
 use DateTime;
 use POSIX qw(fmod);
 
-attribution github => ['https://github.com/GlitchMr', 'GlitchMr'];
+attribution github => ['GlitchMr', 'GlitchMr'];
 
 primary_example_queries '10:00AM MST to PST';
 secondary_example_queries '19:00 UTC to EST', '1am UTC to PST';

lib/DDG/Goodie/Tips.pm

@@ -14,7 +14,7 @@ name 'Tips';
 code_url 'https://github.com/duckduckgo/zeroclickinfo-goodies/blob/master/lib/DDG/Goodie/Tips.pm';
 category 'calculations';
 topics 'everyday';
-attribution github => [ 'http://github.com/mattlehning', 'mattlehning' ];
+attribution github => [ 'mattlehning', 'Matt Lehning' ];
 
 zci answer_type => 'tip';
 zci is_cached   => 1;

lib/DDG/Goodie/TitleCase.pm

@@ -12,8 +12,8 @@ code_url 'https://github.com/duckduckgo/zeroclickinfo-goodies/blob/master/lib/DD
 category 'transformations';
 topics 'words_and_games';
 
-attribution github => ['https://github.com/moollaza', 'moollaza'],
-            github => ['https://github.com/maxluzuriaga', 'Max Luzuriaga'];
+attribution github => ['moollaza', 'Zaahir Moolla'],
+            github => ['maxluzuriaga', 'Max Luzuriaga'];
 
 zci answer_type => "title_case";
 zci is_cached   => 1;

lib/DDG/Goodie/TwelveOclock.pm

@@ -13,7 +13,7 @@ name "TwelveOclock";
 code_url "https://github.com/duckduckgo/zeroclickinfo-spice/blob/master/lib/DDG/Spice/TwelveOclock.pm";
 category "reference";
 topics "everyday";
-attribution github => ['https://github.com/duckduckgo', 'duckduckgo'];
+attribution github => ['duckduckgo', 'DuckDuckGo'];
 
 # Triggers
 triggers any => "midnight", "noon";

lib/DDG/Goodie/UN.pm

@@ -4,7 +4,7 @@ package DDG::Goodie::UN;
 use DDG::Goodie;
 use Number::UN 'get_un';
 
-attribution github => ['https://github.com/tantalor', 'tantalor'];
+attribution github => ['tantalor', 'John Tantalo'];
 
 primary_example_queries 'UN Number 0009';
 description 'gives a description for a given UN number';

lib/DDG/Goodie/UPS.pm

@@ -15,8 +15,8 @@ code_url 'https://github.com/duckduckgo/zeroclickinfo-goodies/blob/master/lib/DD
 category 'ids';
 topics 'special_interest';
 attribution web => [ 'https://www.duckduckgo.com', 'DuckDuckGo' ],
-            github => [ 'https://github.com/duckduckgo', 'duckduckgo'],
-            twitter => ['http://twitter.com/duckduckgo', 'duckduckgo'];
+            github => [ 'duckduckgo', 'DuckDuckGo'],
+            twitter => ['duckduckgo', 'DuckDuckGo'];
 
 # Regex for ups.
 my $ups_qr = qr/ups/i;

lib/DDG/Goodie/URLDecode.pm

@@ -21,6 +21,10 @@ code_url 'https://github.com/duckduckgo/zeroclickinfo-goodies/blob/master/lib/DD
 category 'computing_tools';
 topics 'programming', 'web_design';
 
+attribution web => [ 'https://www.duckduckgo.com', 'DuckDuckGo' ],
+            github => [ 'duckduckgo', 'DuckDuckGo'],
+            twitter => ['duckduckgo', 'DuckDuckGo'];
+
 handle query_raw => sub {
     # unless trigger words exist, only answer when we have a single word
     unless (m/$trigger_words/) {

lib/DDG/Goodie/URLEncode.pm

@@ -21,7 +21,7 @@ category                    'computing_tools';
 topics                      'programming', 'web_design';
 attribution twitter =>      ['nshanmugham', 'Nishanth Shanmugham'],
             web     =>      ['http://nishanths.github.io', 'Nishanth Shanmugham'],
-            github  =>      ['https://github.com/nishanths', 'Nishanth Shanmugham'];
+            github  =>      ['nishanths', 'Nishanth Shanmugham'];
 
 
 handle remainder => sub {

lib/DDG/Goodie/USPS.pm

@@ -14,8 +14,8 @@ code_url 'https://github.com/duckduckgo/zeroclickinfo-goodies/blob/master/lib/DD
 category 'ids';
 topics 'special_interest';
 attribution web => [ 'https://www.duckduckgo.com', 'DuckDuckGo' ],
-            github => [ 'https://github.com/duckduckgo', 'duckduckgo'],
-            twitter => ['http://twitter.com/duckduckgo', 'duckduckgo'];
+            github => [ 'duckduckgo', 'DuckDuckGo'],
+            twitter => ['duckduckgo', 'DuckDuckGo'];
 
 # Regex for usps.
 my $usps_qr = qr/u(?:nited|)s(?:states|)(?:p(?:ostal|)s(?:ervice|)|)/io;

lib/DDG/Goodie/UltimateAnswer.pm

@@ -11,8 +11,8 @@ description 'Hichhiker\'s Guide to the Galaxy reference.';
 category 'special';
 topics 'entertainment';
 code_url 'https://github.com/duckduckgo/zeroclickinfo-goodies/blob/master/lib/DDG/Goodie/UltimateAnswer.pm';
-attribution github  => ['https://github.com/jfeeneywm/', 'jfeeneywm'],
-            twitter => ['https://twitter.com/jfeeneywm', 'jfeeneywm'];
+attribution github  => ['jfeeneywm', 'Jason Feeney'],
+            twitter => ['jfeeneywm', 'Jason Feeney'];
 
 zci answer_type => 'ultimate_answer';
 zci is_cached   => 1;

lib/DDG/Goodie/Unicode.pm

@@ -7,7 +7,7 @@ use Unicode::UCD qw/charinfo/;
 use Unicode::Char ();              # For name -> codepoint lookup
 use Encode qw/encode_utf8/;
 
-attribution github => ['https://github.com/cosimo', 'cosimo'];
+attribution github => ['cosimo', 'Cosimo Streppone'];
 primary_example_queries 'U+590c';
 secondary_example_queries 'unicode white smiling face';
 description 'get information about a unicode character';

lib/DDG/Goodie/UnicodeFuzzySearch.pm

@@ -8,9 +8,9 @@ triggers startend => "unicode";
 zci is_cached => 1;
 
 attribution
-    github => "konr",
-    twitter => "konr",
-    web => "http://konr.mobi";
+    github => ["konr", 'Konrad Scorciapino'],
+    twitter => ["konr", 'Konrad Scorciapino'],
+    web => ["http://konr.mobi", 'Konrad Scorciapino'];
 primary_example_queries 'unicode black heart';
 secondary_example_queries "unicode 2665";
 

lib/DDG/Goodie/Unicornify.pm

@@ -7,7 +7,7 @@ use Email::Valid;
 use Unicornify::URL;
 
 triggers start => 'unicornify';
-attribution github => ['https://github.com/flaming-toast', 'flaming-toast'];
+attribution github => ['flaming-toast', 'Jessica Yu'];
 
 handle remainder => sub {
 	my $link = 'http://unicornify.appspot.com/';

lib/DDG/Goodie/Unidecode.pm

@@ -10,7 +10,7 @@ triggers startend => "unidecode";
 zci is_cached => 1;
 zci answer_type => "convert_to_ascii";
 
-attribution github => ['https://github.com/moritz', 'moritz'];
+attribution github => ['moritz', 'Moritz Lenz'];
 primary_example_queries 'unidecode møæp';
 secondary_example_queries "unidecode å亰";
 description 'decode special non-latin characters';

lib/DDG/Goodie/UnixPermissions.pm

@@ -12,8 +12,8 @@ zci answer_type => 'unix_permissions';
 primary_example_queries 'chmod 755';
 secondary_example_queries 'permission 0644';
 description 'Returns the textual description of file modes in UNIX';
-attribution github => ['https://github.com/koosha--', 'koosha--'],
-            twitter => '_koosha_';
+attribution github => ['https://github.com/koosha--', 'Koosha K. M.'],
+            twitter => ['_koosha_', 'Koosha K. M.'];
 code_url 'https://github.com/duckduckgo/zeroclickinfo-goodies/blob/master/lib/DDG/Goodie/UnixPermissions.pm';
 topics 'sysadmin';
 category 'computing_tools';

lib/DDG/Goodie/UnixTime.pm

@@ -13,7 +13,7 @@ triggers startend => @trigger_words;
 zci answer_type => "time_conversion";
 zci is_cached   => 0;
 
-attribution github => ['https://github.com/codejoust', 'codejoust'];
+attribution github => ['codejoust', 'Iain '];
 
 primary_example_queries 'unix time 0000000000000';
 secondary_example_queries 'epoch 0', 'epoch 2147483647';

lib/DDG/Goodie/Uppercase.pm

@@ -20,8 +20,8 @@ code_url    'https://github.com/duckduckgo/zeroclickinfo-goodies/blob/master/lib
 category    'conversions';
 topics      'programming';
 
-attribution twitter => 'crazedpsyc',
-            cpan    => 'CRZEDPSYC' ;
+attribution twitter => ['crazedpsyc', 'Michael Smith'],
+            cpan    => ['CRZEDPSYC', 'Michael Smith'];
 
 handle remainder => sub {
     my $input = shift;

lib/DDG/Goodie/Uptime.pm

@@ -18,7 +18,7 @@ topics "computing";
 code_url "https://github.com/duckduckgo/zeroclickinfo-goodies/blob/master/lib/DDG/Goodie/Uptime/Uptime.pm";
 attribution github => ["YouriAckx", "Youri Ackx"],
             web => ["http://ackx.net/", "Youri Ackx"],
-            twitter => "YouriAckx";
+            twitter => ["YouriAckx", "Youri Ackx"];
 
 # Triggers
 triggers startend => "uptime", start => "uptime of";

lib/DDG/Goodie/VIN.pm

@@ -14,9 +14,9 @@ name 'VIN';
 code_url 'https://github.com/duckduckgo/zeroclickinfo-goodies/blob/master/lib/DDG/Goodie/VIN.pm';
 category 'ids';
 topics 'special_interest';
-attribution web => [ 'https://www.duckduckgo.com', 'DuckDuckGo' ],
-            github => [ 'https://github.com/duckduckgo', 'duckduckgo'],
-            twitter => ['http://twitter.com/duckduckgo', 'duckduckgo'];
+attribution web => ['https://www.duckduckgo.com', 'DuckDuckGo'],
+            github => ['duckduckgo', 'DuckDuckGo'],
+            twitter => ['duckduckgo', 'DuckDuckGo'];
 
 triggers query_lc => qr/([\d+a-z]{17})|
                         (^\d+$)

lib/DDG/Goodie/Week.pm

@@ -19,8 +19,8 @@ name "Week";
 code_url "https://github.com/duckduckgo/zeroclickinfo-goodies/blob/master/lib/DDG/Goodie/Week.pm";
 category "dates";
 topics "everyday", "special_interest";
-attribution twitter => "garrettsquire",
-            github => "gsquire";
+attribution twitter => ["garrettsquire", 'Garrett Squire'],
+            github => ["gsquire", 'Garrett Squire'];
 
 triggers any => 'week';
 

lib/DDG/Goodie/WeekdaysBetween.pm

@@ -17,8 +17,8 @@ category                    'calculations';
 topics                      'everyday';
 primary_example_queries     'weekdays between 01/31/2000 01/31/2001';
 code_url                    'https://github.com/duckduckgo/zeroclickinfo-goodies/blob/master/lib/DDG/Goodie/WeekdaysBetween.pm';
-attribution                 github => ['http://github.com/syst3mw0rm', 'syst3mw0rm'],
-                            email => ['syst3m.w0rm@gmail.com', 'syst3m.w0rm@gmail.com'];
+attribution                 github => ['syst3mw0rm', 'Aamir Khan'],
+                            email => ['syst3m.w0rm@gmail.com', 'Aamir Khan'];
 
 my $datestring_regex = datestring_regex();
 

lib/DDG/Goodie/WhereAmI.pm

@@ -14,8 +14,8 @@ name 'WhereAmI';
 code_url 'https://github.com/duckduckgo/zeroclickinfo-goodies/blob/master/lib/DDG/Goodie/WhereAmI.pm';
 category 'computing_tools';
 topics 'travel';
-attribution twitter => 'crazedpsyc',
-            cpan    => 'CRZEDPSYC' ;
+attribution twitter => ['crazedpsyc', 'Michael Smith'],
+            cpan    => ['CRZEDPSYC', 'Michael Smith'];
 
 handle remainder => sub {
     return if length($_) or !$loc or !$loc->city;

lib/DDG/Goodie/WorkdaysBetween.pm

@@ -21,7 +21,7 @@ name 'WorkDaysBetween';
 code_url 'https://github.com/duckduckgo/zeroclickinfo-goodies/blob/master/lib/DDG/Goodie/WorkdaysBetween.pm';
 category 'calculations';
 topics 'everyday';
-attribution github => ['http://github.com/mgarriott', 'mgarriott'];
+attribution github => ['http://github.com/mgarriott', 'Matt Garriott'];
 
 my $datestring_regex = datestring_regex();
 

lib/DDG/Goodie/ZappBrannigan.pm

@@ -10,8 +10,8 @@ triggers any => "zapp", "brannigan";
 zci answer_type => 'zapp_brannigan';
 zci is_cached   => 0;
 
-attribution github => ['http://github.com/nospampleasemam', 'nospampleasemam'],
-            web    => ['http://github.com/nospampleasemam', 'nospampleasemam'];
+attribution github => ['nospampleasemam', 'Dylan Lloyd'],
+            web    => ['nospampleasemam', 'Dylan Lloyd'];
 
 primary_example_queries 'zapp brannigan quote';
 name 'Zapp Brannigan';