Added dictionaries, plus made makefiles work better

makefiles now use tabs rather than spaces