merge
Update custom elisp
Merge branch 'master' of https://github.com/nickpascucci/DotEmacs

Conflicts:
	emacs-custom.el
	init.el
	nick-custom.el
Merge branch 'master' of https://github.com/nickpascucci/DotEmacs

Conflicts:
	emacs-custom.el
	init.el
Add Dash, SmartParens, and Elib.
Add a variety of custom code:

+ Concat lines with M-j
+ An ansi-term 'visor' inspired by https://gist.github.com/rawsyntax/5021575 toggled by F11
+ F12 toggles TODO list
+ New changes visible mode
+ nxml-based tree location
Update fill-column-indicator and fix visible-mark.el
Update color theme.
Customize font and powerline and ediff settings.
Remove unused requires.
Update gui vs term configs.
Allow narrowing.
Update help text.
Add in some old configs.
Update powerline colors
Merge branch 'master' of /home/nick/downloads/emacs

Conflicts:
	init.el
	nick-custom.el