Merge new config option to set placement of edit toolbar

Still leaves a bit to be desired, per this screenshot. But I'll address some of the usability issues in a future commit. 

![2014-10-09 17_31_29-n2 management](https://cloud.githubusercontent.com/assets/1422004/4586321/461ffc48-5015-11e4-95f4-c7b1d136ccc4.png)