change folder to hidden
replace desktop key
sublime text 3
update phantomjs setup
Merge remote-tracking branch 'origin/master' into dimelo