Minor changes to the placement of ACP options

Now that we have some more options, I think it looks better to put all the yes/no switches together, like so:
![screen shot 2014-11-08 at 9 32 52 pm](https://cloud.githubusercontent.com/assets/303711/4966573/46ae343e-67d2-11e4-9cc7-d7078e8803a2.png)