Squashed commit of the following:

commit aa0a91b29917160e94c71b39a8ce563d5866be2a
Author: tspurway <tspurway@gmail.com>
Date:   Fri Oct 3 15:38:13 2014 -0400

    more changes, same line

commit b2ceb81da20d691fe68d5ea7f9b690c3afde3f65
Author: tspurway <tspurway@gmail.com>
Date:   Fri Oct 3 15:34:23 2014 -0400

    changes