Gruntfile: Added options to gconfig, merge files and grunt config options.
TEST: Added fixture for merge file.
TEST: Updated dev html expected output.
TEST: Updated dist html expected output.
TASK: Updated gconfig to handle merge options.
Merge pull request #3 from goliatone/merge_configs

Merge configs