2014.11

next time... pull THEN commit

also some spacing changes to make me happy