- Added custom elpy minor modes config
- Forced CUDA files to be treated as C++ files
Merge branch 'master' of https://github.com/Imxset21/emacs-config

Conflicts:
	emacs-custom.el

- Merged custom face settings, eliminated green background bug when starting with "-nw"