Removed global ibuffer settings; local settings are now used instead.
More snippet work.
Changed reindent function to save excursion.
Fixed key mapping for reindent bufffer.
Made colors for window-system and terminal different.
Merge branch 'master' of https://github.com/jpace/emacs

Conflicts:
	dot.emacs
	yasnippet/snippets/java-mode/pv.j