changed interval to 30 sec
new fbu function
added do_upload
Merge remote-tracking branch 'upstream/master'

Conflicts:
	.conky/weechat_notify.sh
update