Merge pull request #5 from jpangborn/missing-keywords

Missing keywords
Merge pull request #6 from jpangborn/missing-keywords

Additional Classes and Keywords, Trigger Variables
Merge remote-tracking branch 'upstream/master'