Change language to locale where applicable.
Remove code doing nothing.
Standardizing function and variable names.
Formatting fix.
Merge pull request #51 from drewjw81/language-to-locale

Language to locale