Short code spelling

The ShortCodes resource needs to request ShortCodes not Shortcodes. There are other commits in this diff because I am lazy and need to keep merging branches to make the automated tests pass :)