Update dash
Update clj-refactor, expand-region and tagedit
Go straight to ~/ with ~ AND C-~ in ido-find-file
More folders to ignore with ffip

- bower components
- tmp
Add scala and php hooks
Local updates
Merge remote-tracking branch 'upstream/master' into merged

Conflicts:
	custom.el
	setup-ffip.el
	site-lisp/clj-refactor
	site-lisp/dash
	site-lisp/expand-region