Merge init's into one file.  Switch to quelpa w/ a switch.

Remove leftover elpy config if using company.

Use `defadvice` to allow disabling of quelpa or diminish.