Add ELLIS_USER option to override the Ellis login
Merge remote-tracking branch 'origin/master' into custom_usernames

Conflicts:
	README.md
Merge pull request #75 from Metaswitch/custom_usernames

[Reviewer: Andy] Add ELLIS_USER option to override the Ellis login