phantomjs.log to gitignore
merge