Update magma (July 18 2013)

Signed-off-by: Alec Ari <neotheuser@ymail.com>
Updated to magma Jul 28, 2013

Signed-off-by: Shahbaz Youssefi <ShabbyX@gmail.com>
Merge with magma

- Most conflicts were whitespace

Signed-off-by: Shahbaz Youssefi <ShabbyX@gmail.com>