merge task defaults to 'no'
merge task is no longer called by setup
merge task appended to the end
improved hljs task; removed Amelia theme
hljs task no longer called
updated instructions
Merge pull request #120 from idleberg/2.0-dev

2.0 dev