come on asshole
Merge branch 'master' of github.com:vnoel/pycode

It looks like I don't understand this amend stuff.

Conflicts:
	tests/test_calipso_l2.py