Deleting powerline
Merge branch 'master' of https://github.com/dlineberger/.emacs.d

Conflicts:
	custom.el
	init.el