Replace keywords with a dictionary

Beware! Still a bit wonky.
Updated .gitignore
Added scripts for testing