Merge the 2 other open pull requests

This Pull Request simply merges the other two pull requests, an outstanding patch, re-flows the boxes, and fixes some indentation consistency issues.  

Closes #14
Closes #15
Includes patch from http://mailman.mit.edu/pipermail/mosh-devel/2013-April/000488.html