Add ace-window package
Merge branch 'master' of github.com:thbkrshw/emacs24

Conflicts:
	proxy.el
Merge existing update