Reformatted main parse statement
Added name variants to dialect rule
Updated help string
Merge remote-tracking branch 'upstream/master'
Fix outstanding issues as found in the test room
Fix outstanding issues as found in the test room
Merge pull request #12 from johnk-/master

Updates following testing on new EC2 instance