Update magma (Oct 4 2013)

Signed-off-by: Alec Ari <neotheuser@ymail.com>
Update README.md

Signed-off-by: Alec Ari <neotheuser@ymail.com>
Merge branch 'magma' into dev

Signed-off-by: Alec Ari <neotheuser@ymail.com>

Conflicts:
	README.md