Merge branch 'missing-keywords'
Merge remote-tracking branch 'origin/missing-keywords'
Add Built-in Exception Types
Merge remote-tracking branch 'upstream/master'
Merge pull request #7 from jpangborn/master

Add Exception Types