Fixed typo in file name
Updated grunt build loop to concatenate all files

Added country and webapp_country; reordered the list of files for
clarity