Merge pull request #10 from chrso/master

Vagrant
Added make as Vagrant dependency

So can use "make clean" to remove PLY-generated files
Merge pull request #11 from kaitlinhuben/khuben/testing

Added make as Vagrant dependency
Added more keywords and reserved language types
More updates to lexer
First attempt at full-grammar parser

Should take string and parse it, then rebuild and return it

Needs to cast empties/ints/etc. to str for success

Also need to fix shift/reduce and reduce/reduce conflicts
Merge pull request #12 from kaitlinhuben/khuben/testing

Lexer changes
Updated syntax in test files
Merge pull request #13 from kaitlinhuben/khuben/testing

Updated syntax in test files