Issue 304 organisations short name

See #304.

<!---
@huboard:{"order":150.375,"custom_state":""}
-->