Merge pull request #283 from mballance-sf/master

- #(309) - Correct a NPE in the label provider with an unlabeled generate statement
Add Defparams to the Outline view
Merge remote-tracking branch 'origin/master'
- #(enh) - Add defparam statements to the Outline view
Add content assist for module parameters declared on the containing
module
Merge remote-tracking branch 'upstream/master'
- #(enh) - Add content assist support for parameters declared on the 
  containing module