Added alice
Added shortname options
Merge some minor changes
Conflicts:
	hosts.py
Updates for targeting of March 2014 IMACS run