Updated emacs extensions.
Preparation for merging upstream.
Merge remote-tracking branch 'refs/remotes/upstream/master'

Conflicts:
	.gitignore
	bash/.bashrc
	emacs/.emacs
	emacs/.emacs.d/ac-comphist.dat
	emacs/.emacs.d/elpa/archives/gnu/archive-contents
	emacs/.emacs.d/elpa/archives/marmalade/archive-contents
	emacs/.emacs.d/elpa/expand-region-0.8.0/expand-region-autoloads.el
	emacs/.emacs.d/elpa/ido-ubiquitous-1.6/ido-ubiquitous-autoloads.el
	emacs/.emacs.d/elpa/ido-ubiquitous-1.6/ido-ubiquitous.el
	emacs/.emacs.d/elpa/magit-1.2.0/magit-autoloads.el
	emacs/.emacs.d/elpa/undo-tree-0.6.3/undo-tree-autoloads.el
Added init file for ido
Further modularized emacs config. Added new functions and bindings.
Deleted old packages.
Merge remote-tracking branch 'refs/remotes/upstream/master'

Conflicts:
	bash/.bashrc
	emacs/.emacs
	emacs/.emacs.d/startup/ido.el
Local changes