Ack upgrade + todo.txt stuff
Updates to test scripts to work better with gradle