er.remap renamed to erpxe.remap
Merge branch 'master' of github.com:ERPXE/tftpboot

Conflicts:
	CHANGELOG