Fix move_up_level
Merge branch 'master' of https://github.com/spencersugarman/url.py

Conflicts:
	url.py