Merge or cut bait

[vinniefalco]

There are several branches that are at various levels of aging which have unmerged changes. The sources have diverged significantly and the chances of a clean merge are essentially nil. We need to figure out whether or not each branch contains important commits and then either cherry pick them and fix the conflicts, or delete the branches.

Also, it would be best for everyone to work in their own fork so we dont have to see the feature / fix branches appear in the main repository. By doing this, we will never have to delete unmerged or merged branches again (they will just accumulate in the corresponding developers' repository until dealt with).

[vinniefalco]

I'd also like to add that GitHub's "Pull Request" web page slows down when there are more branches in the main repo.

[vinniefalco]

Looks like we've made good progress trimming the dead branches. Especially now that people are working in their own forks instead of pushing feature branches directly to the main repository. We just have a little more to go!

[vinniefalco]

Repositories look clean now.