Update to Almura name

Signed-off-by: Steven Downer <grinch@outlook.com>
Backport newer patches from Spigot 1.7

Signed-off-by: Steven Downer <grinch@outlook.com>