Fixed error with nonterminal type params, cleaned up logic for pulling in dependencies
Merge branch 'master' of github.com:cwi-swat/rascal