Merge remote-tracking branch 'upstream/epsilon' into epsilon

Author: Jude Hungerford

.gitignore

@@ -6,3 +6,6 @@
 .metadata
 *.buildpath
 submissions/*
+maps/*
+server_info.py
+server_info.php

.gitmodules

@@ -4,3 +4,6 @@
 [submodule "ants/dist/starter_bots/c"]
 	path = ants/dist/starter_bots/c
 	url = https://github.com/flagcapper/GoogleAI-Ants-Starter-Pack.git
+[submodule "ants/dist/starter_bots/haskell"]
+	path = ants/dist/starter_bots/haskell
+	url = https://github.com/qacek/ants-haskell.git

INSTALL.md

@@ -3,13 +3,11 @@
 * Install Ubuntu 11.04
 * Install git and a few of your favorite admin tools
 * Create the `contest` user
+    For Ubuntu: `sudo useradd -d /home/contest -m -s /bin/bash contest`
+* Switch to contest user: `sudo su contest; cd ~`
 * `git clone` the repository inside
-* Initialize the git submodules, see the README for more details.
+* Initialize the git submodules. `git submodule init; git submodule update`
 * `sudo python setup/server_setup.py`
 
     * Leave blank for root mysql password (TODO: Fix this) if there's no mysql installed (change it later after install).
     * Website hostname option is used by the apache host setup, do not include port in there.
-    
-* Configure email sending, change website/server_info.php
-
-    * set "mailer_address" => "donotsend" if you do not want emails

README.md

@@ -24,4 +24,4 @@ Initializing the git submodules:
 Installation
 ---------------
 
-Follow `INSTALL.md`.
+Follow [INSTALL.md](https://github.com/aichallenge/aichallenge/blob/epsilon/INSTALL.md).

ants/.gitignore

@@ -1,3 +1,3 @@
 *.hg
 *.hgignore
-output
+game_logs