515 really mirror master

![screen shot 2014-08-09 at 7 10 22 pm](https://cloud.githubusercontent.com/assets/175305/3868098/e242b8cc-2022-11e4-97ab-c4426b8fdaa1.png)
![screen shot 2014-08-09 at 7 10 29 pm](https://cloud.githubusercontent.com/assets/175305/3868099/e3526b18-2022-11e4-99a8-d71304849c9e.png)

ref #484