renaming files
removed whitespace

Merge branch 'master' of github.com:jpredham/jp-emacs

Conflicts:
	init.el