Set TAB default to autocomplete
Don't actually care about alternative_order
Enable only MELPA and use Customize for default theme
Remove imenu and use ocp-indent in tuareg
Merge branch 'master' of https://github.com/charlespittman/dot_files

Conflicts:
	emacs/emacs