Merge pull request #307 from mballance-sf/master

Updates for Luna and bugfix to support escaped identifiers (#325)
- Merged with Mat's
Fix for #321 - Indentation of generate blocks
- Added testcase
- Handled Generate statements property
Backing out changes accidentally added in previous merge
Merge pull request #308 from stevenaz/master

Fix for bug 321 - Generate indentation
Fix for #(326) - Comments after assign statements incorrectly indented
Merge pull request #309 from stevenaz/master

Fix for #(326) - Comments after assign statements incorrectly indented
Fixed "unindent" of closing braces
Updated changelog
Merge pull request #310 from stevenaz/master

Fixed "unindent" of closing braces
Add new test data files. Small updates to the project builder to enable
incremental builds
Merge remote-tracking branch 'upstream/master'