Finish resolving #98 - git town configuration and help

Squashed commit of the following:

commit 2481b13ba1a7dec59237de7759eadad690420b46
Merge: 3493ada c7a5a48
Author: Allen Wu <allen.wu@ucla.edu>
Date:   Tue Dec 23 09:21:58 2014 -0800

    Merge branch 'master' into aw-finish-config

commit 3493ada5e70fb13c1137b0d7d50c0dd3369b7b3b
Author: Allen Wu <allen.wu@ucla.edu>
Date:   Sat Dec 20 15:15:14 2014 -0800

    Remove "just"

commit 4b9b68c45afc7a18b308dfebaf8830b0c8635a5a
Author: Allen Wu <allen.wu@ucla.edu>
Date:   Sat Dec 20 15:12:47 2014 -0800

    Clarify configuration in readme

commit 8ecad269f24856bab21784b126cdb6ace99ef377
Author: Allen Wu <allen.wu@ucla.edu>
Date:   Sat Dec 20 15:08:12 2014 -0800

    Updated readme/manpage

commit b99f182f2a9746e7e9fa5a389deeb6124418a91d
Merge: c5e058b 96ec22f
Author: Allen Wu <allen.wu@ucla.edu>
Date:   Sat Dec 20 14:49:32 2014 -0800

    Merge branch 'master' into aw-finish-config

commit c5e058b23ea6399d865cae81f065cb9e5ccf741f
Author: Allen Wu <allen.wu@ucla.edu>
Date:   Sat Dec 20 12:10:20 2014 -0800

    Updated readme

commit 7d94599289e4e16bb34fe3b65c3b9dffab1911d2
Author: Allen Wu <allen.wu@ucla.edu>
Date:   Sat Dec 20 12:03:25 2014 -0800

    Break up cucumber step

commit a10813017e29f4dd5246bdb17f11e6c542ec811f
Author: Allen Wu <allen.wu@ucla.edu>
Date:   Fri Dec 19 18:06:38 2014 -0800

    Updated git-town.md to better follow git-remote's example

commit 12cf772a5b3855a0b42fdf17b7fac06f38fb799a
Author: Allen Wu <allen.wu@ucla.edu>
Date:   Fri Dec 19 17:21:49 2014 -0800

    Typo

commit fa3784dff21807b580eedd4fee5c875b499b8930
Author: Allen Wu <allen.wu@ucla.edu>
Date:   Fri Dec 19 17:21:16 2014 -0800

    Update readme

commit 439c0d6ce67d4c17d599c9486fe3ef5f485a1967
Author: Allen Wu <allen.wu@ucla.edu>
Date:   Fri Dec 19 17:19:47 2014 -0800

    Changes git-town manpage heading

commit 9a15b1acd7e3e225d8d5927ea5787adc87ca82c4
Author: Allen Wu <allen.wu@ucla.edu>
Date:   Thu Dec 18 22:56:58 2014 -0800

    No need to show config details in readme.md

commit 6e74e949d4162d846378d01720689acde5e819aa
Merge: 0576399 dbc5fc1
Author: Allen Wu <allen.wu@ucla.edu>
Date:   Thu Dec 18 22:49:52 2014 -0800

    Merge branch 'master' into aw-finish-config

commit 05763996d7bd141bd2e15de786cc5703f358e3c4
Author: Allen Wu <allen.wu@ucla.edu>
Date:   Tue Dec 16 23:24:55 2014 -0800

    Updated readme

commit fe271d8cec8bde13e52c907b20ef2fa10530b4da
Author: Allen Wu <allen.wu@ucla.edu>
Date:   Tue Dec 16 23:16:17 2014 -0800

    Updated git-town.md

commit 93067321ce09fa39ee401396cc9404d30450ed1d
Merge: 8355f86 561b8fa
Author: Allen Wu <allen.wu@ucla.edu>
Date:   Tue Dec 16 22:57:32 2014 -0800

    Merge branch 'master' into aw-finish-config

    Conflicts:
    	features/git-town/help.feature

commit 8355f86c5bfd567fe21fa9a7133e03b2b30a3c77
Author: Allen Wu <allen.wu@originate.com>
Date:   Mon Dec 15 13:05:50 2014 -0800

    git-town manpage header names

commit 44e8c72e7473802ed2f456d96213a182ee6bc7d0
Author: Allen Wu <allen.wu@originate.com>
Date:   Mon Dec 15 12:56:15 2014 -0800

    Newline

commit b167ba162fb1e3ec1ff73050b20e95fd31552e57
Author: Allen Wu <allen.wu@originate.com>
Date:   Mon Dec 15 12:55:20 2014 -0800

    DRY up test

commit dbe9b7a53370f384de033b69b64aacc3a518503e
Author: Allen Wu <allen.wu@ucla.edu>
Date:   Sun Dec 14 22:03:43 2014 -0800

    Updated readme

commit 54da1221595b0b066f1d6a787d8e24696834d4b4
Author: Allen Wu <allen.wu@ucla.edu>
Date:   Sun Dec 14 22:00:52 2014 -0800

    Updated release notes, added git-town.md

commit b5b1930f62096d36c2b1fc8819e06279de0e4c94
Author: Allen Wu <allen.wu@ucla.edu>
Date:   Sun Dec 14 18:04:28 2014 -0800

    Fixed test

commit fba3b6b18e148f0b290153550e19289896129d7a
Author: Allen Wu <allen.wu@ucla.edu>
Date:   Sun Dec 14 18:01:36 2014 -0800

    Update usage output

commit 1c06b2f401e9f2f147e72f24daed20d1ea1d1c0b
Author: Allen Wu <allen.wu@ucla.edu>
Date:   Sun Dec 14 17:58:17 2014 -0800

    [--add|--remove] -> (--add | --remove)

commit bc61bc7a8bd562b378dfcd483097f1d4b5e9f00e
Author: Allen Wu <allen.wu@ucla.edu>
Date:   Sun Dec 14 17:55:02 2014 -0800

    Refactor [none] output

commit 6615198b26f6fa2fbb9411bd9ba600373f4fffaf
Author: Allen Wu <allen.wu@ucla.edu>
Date:   Sun Dec 14 17:50:59 2014 -0800

    Split string improvements - remove_string completely removes the line so that you don't end up with something like: ("abc,def,g" -> "abc,,g")

commit b976b075bfeddcf199311726290e61c109274637
Author: Allen Wu <allen.wu@ucla.edu>
Date:   Sun Dec 14 16:57:35 2014 -0800

    Fixed indentation, quotes

commit 49943426f101dfbaa309ee72a7eec2528dbd6e94
Author: Allen Wu <allen.wu@ucla.edu>
Date:   Sun Dec 14 16:55:36 2014 -0800

    Use `ensure_has_branch`, added one test

commit 5b53756b60c84dd84cf0f3ffd144556dd56bef68
Author: Allen Wu <allen.wu@ucla.edu>
Date:   Sun Dec 14 15:01:39 2014 -0800

    Detect invalid commands

commit 8d308ef36ca59e11bdb44c7f6f668bcfd328f601
Author: Allen Wu <allen.wu@ucla.edu>
Date:   Sun Dec 14 14:51:04 2014 -0800

    Fixed ambiguous cucumber tests

commit 177eceab9e76d7900567d6c294912dea1e440edb
Author: Allen Wu <allen.wu@ucla.edu>
Date:   Sun Dec 14 14:39:34 2014 -0800

    More tests and ensure valid branches before adding to configuration

commit 002539b07ec2c84108adaad453c084b9fcae3afe
Author: Allen Wu <allen.wu@ucla.edu>
Date:   Sun Dec 14 14:06:10 2014 -0800

    Removed help.txt, show man page for `git town [help]`

commit 195635d9be9f93fb687c957a2424908fab7af3d6
Author: Allen Wu <allen.wu@ucla.edu>
Date:   Sun Dec 14 12:48:23 2014 -0800

    Test `git town non-feature-branches` usage

commit 07e1943ea1729c29349b7894dcea06467ce25801
Author: Allen Wu <allen.wu@ucla.edu>
Date:   Sun Dec 14 12:40:54 2014 -0800

    --config->config, --version->version

commit 579c1561486d00d04e817533ce71363fbd8cf339
Author: Allen Wu <allen.wu@ucla.edu>
Date:   Sun Dec 14 12:37:52 2014 -0800

    Standardize [none] / [not configured yet]

commit 525de97c26eda3a49058b25e9312c5c7f1b441e8
Author: Allen Wu <allen.wu@ucla.edu>
Date:   Sun Dec 14 12:33:55 2014 -0800

    Reorganized features

commit 91e2c78068935665d528dbd337b6e38e138e9ce2
Merge: ce67f26 53debb0
Author: Allen Wu <allen.wu@ucla.edu>
Date:   Sun Dec 14 12:21:43 2014 -0800

    Merge branch 'master' into aw-finish-config

commit ce67f2681913b30c2bbd50b4d7a2d30ba4d38e3c
Author: Allen Wu <allen.wu@originate.com>
Date:   Fri Dec 12 23:43:30 2014 -0800

    More kappamaki

commit 47afdaebb7188612b6bcd69db4ed4e7aac3c6de2
Author: Allen Wu <allen.wu@originate.com>
Date:   Fri Dec 12 23:40:39 2014 -0800

    Appease rubocop

commit c7a10b2b432f6fe1106e893acfd4d638e080c214
Author: Allen Wu <allen.wu@originate.com>
Date:   Fri Dec 12 23:39:33 2014 -0800

    Moved functions to helpers/configuration.sh

commit f4120f5ecc16c4e54f23471eda93fcda72d6c73d
Author: Allen Wu <allen.wu@originate.com>
Date:   Fri Dec 12 23:30:40 2014 -0800

    Use kappamaki

commit 5f327a3d780e8aa89b5742a62a9e51a891eeee17
Author: Allen Wu <allen.wu@originate.com>
Date:   Fri Dec 12 23:30:12 2014 -0800

    Fixed typo

commit 9d47e1abb8a9df0e3204855eb5ce02e8df73c808
Author: Allen Wu <allen.wu@originate.com>
Date:   Fri Dec 12 23:20:12 2014 -0800

    unconfigured->not configured

commit dac1eb5faf22cd79a141181fdeb7f610192141b9
Author: Allen Wu <allen.wu@originate.com>
Date:   Fri Dec 12 23:18:15 2014 -0800

    Clarify tests

commit 295cd349a167c9173b14eac03f75133360c6ceea
Author: Allen Wu <allen.wu@originate.com>
Date:   Fri Dec 12 23:07:55 2014 -0800

    Don't quote branches

commit 2c7d14e0ecd9bfbf35a953d0b9c04569edd94e81
Author: Allen Wu <allen.wu@originate.com>
Date:   Fri Dec 12 23:00:52 2014 -0800

    Show [none]/[not configured yet] rather than ''

commit 2c6ac32ad5ac40e14958a406f008d748185aea47
Author: Allen Wu <allen.wu@originate.com>
Date:   Fri Dec 12 22:46:06 2014 -0800

    Cleaned up git-town option parsing

commit 3c0e465721b996e30eda58eb8f02326f20baa2ae
Author: Allen Wu <allen.wu@originate.com>
Date:   Fri Dec 12 22:35:33 2014 -0800

    Proper ordering

commit b769648eee38b66f70ab8dc85d97bf9112a8fb00
Author: Allen Wu <allen.wu@originate.com>
Date:   Fri Dec 12 22:28:48 2014 -0800

    Removed "nothing to do"

commit 200138ea8679ecbc55dc4bfb13acc128344963bb
Author: Allen Wu <allen.wu@originate.com>
Date:   Fri Dec 12 22:27:54 2014 -0800

    Renamed shell_helpers -> string_helpers.sh

commit a75a22716d547cca4c2335964d77c8fe74046541
Author: Allen Wu <allen.wu@originate.com>
Date:   Fri Dec 12 22:26:00 2014 -0800

    Updated help.txt

commit b2f4bfc7da252265ebc1e84fbb8a86eb405e0fb6
Author: Allen Wu <allen.wu@originate.com>
Date:   Fri Dec 12 21:56:40 2014 -0800

    Resolved merge

commit fc39a70816c203a898280dfea68316f29a5cde0e
Merge: 2835e76 e52203c
Author: Allen Wu <allen.wu@originate.com>
Date:   Fri Dec 12 21:46:10 2014 -0800

    Merge branch 'master' into aw-finish-config

    Conflicts:
    	helpers/git_helpers.sh
    	helpers/helpers.sh

commit 2835e768886e879d7eb8b85da484620aef6a0e23
Author: Allen Wu <allen.wu@ucla.edu>
Date:   Sun Dec 7 23:32:45 2014 -0800

    Updated help.txt

commit 2764920ec0e32eace8d7c37e992033a250121aee
Author: Allen Wu <allen.wu@ucla.edu>
Date:   Sun Dec 7 23:22:51 2014 -0800

    Fixed test

commit fc7cca2caa1318ea92fdbb4d4915946c4806c352
Author: Allen Wu <allen.wu@ucla.edu>
Date:   Sun Dec 7 22:55:23 2014 -0800

    Lint

commit cf2a3d6a3bd9e30dacb86a427214a367549b379e
Author: Allen Wu <allen.wu@ucla.edu>
Date:   Sun Dec 7 22:54:53 2014 -0800

    Added `git town non-feature-branches --remove <branch>`

commit 7156a06bb9364e93999f17a05ec3bd7e9f43551a
Author: Allen Wu <allen.wu@ucla.edu>
Date:   Sun Dec 7 22:18:35 2014 -0800

    Added `git town non-feature-branches --add <branch>`

commit 6f48b40d7c2867f47da29b29f89b9947741a7b58
Author: Allen Wu <allen.wu@ucla.edu>
Date:   Sun Dec 7 15:02:48 2014 -0800

    Reorganized config tests

commit 15d9a7190df1afbf7364ea1ec04345e533333b25
Author: Allen Wu <allen.wu@ucla.edu>
Date:   Sun Dec 7 14:58:15 2014 -0800

    Added `git town (main-branch|non-feature-branches)`

commit ec2865d43ad90e7f9e69ac07d1d49848581d5a81
Author: Allen Wu <allen.wu@ucla.edu>
Date:   Sun Dec 7 14:11:21 2014 -0800

    Allow `git town` usage even when unconfigured
Merge branch 'master' into kg-user-stories-hack