fixed truncated message problems
Merge branch 'master' of github.com:fnl/medic

Conflicts:
	src/medic/test/orm_test.py