floating classes updated
neverland adjusted
Merge remote-tracking branch 'upstream/master'
new files, changed away from irssi-libnotify
modifications..
Merge remote-tracking branch 'upstream/master'

Conflicts:
	.xinitrc
	.xmobar/conkyrc-xmobar
modifications for powerline
Merge remote-tracking branch 'upstream/master'
modification after merge
synaptic disable