An original commit on new machine
Merge branch 'new-master' into jn-big
Not recognizing linux system properly
Commented out some el-get packages that weren't compiling for some reason on linux and thus trashing my emacs initialization
Added back some stuff in inputrc to help input on linux/non-iTerm terminals
Minor changes
Change if condition to fix broken bash completion sourcing
Disabling tcp emacs server and stuff on unix i guess - mucking with emacs-server settings
Merge remote-tracking branch 'refs/remotes/origin/jn-big' into new-master