add config file for jasmine-headless-webkit and update setup script
add alias for git merge