Renaming init files to setup, it keeps the main init file distinct.
Merge branch 'master' of github.com:glynnforrest/emacs.d