Switch to Phoenix master

Change-Id: Ib80785b4d4f61f4113714ea4562cec6e130b7966
Clean things up a bit

Change-Id: I75c6f184ffcec7044419a035314c8b218adac714
Bump v0.1.2

Change-Id: I2264dd941a22c649c22122e89470c9ecc972b533