Update to magma Dec-12-2013

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

Signed-off-by: Shahbaz Youssefi <ShabbyX@gmail.com>
Undo math fix in favor of upstream's fix

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

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