Code cleanup continues.
Merge branch 'master' of github.com:deajan/obackup

Conflicts:
	obackup.sh
Code cleanup continues.