Changes for Linux in terminal (check window-system for turning off tool-bar-mode, don't apply color theme unless window-system)
Merge branch 'master' of github.com:nileshk/emacs