added neat-status plugin
added powerline plugin
Merge branch 'add_neatstatus'

Conflicts:
	.gitmodules