Cleaned up completion list
Added missing completions/keywords
Merge pull request #8 from Ragnar-F/master

Cleaned up completion list; Added missing completions/keywords