Initialize 'amount' variable to 0
Merge branch 'master' into libtermkey
Unwrap some lines in proto.h
Merge branch 'master' into libtermkey

Conflicts:
	src/proto.h
Use a better-performing hack for updating after keypresses