Merge pull request #42 from frisi/uptime-fix

fix argument parsing (uptime and name got mixed up) and add a test
Conflicts:
	superlance/memmon.py
	superlance/tests/memmon_test.py
Merge pull request #44 from lukasgraf/master

Memmon: Add support for checking against cumulative RSS
Conflicts:
	CHANGES.txt
	superlance/memmon.py
Fix deprecated assertions
Add changelog entry for 8603ce441c04a1b91b2e009e154bdccf552f3573
Add changelog entry for d8cb8f28238ad5bce7427862a3253e61a72bf8f2
Prepare 0.11 release
Merge branch '0.11-branch'

Conflicts:
	CHANGES.txt
	docs/conf.py
	setup.py
	superlance/memmon.py
	superlance/tests/memmon_test.py