20131021 eth bug fixes

This branch contains several bug fixes. Also, in the middle of this branch I accidentally hit 'rebuild', so I took that opportunity to remove unnecessary Q_OBJECT; calls and moc_ files.

There were conflicts in the merge with develop, and it was so bad that I ended up getting a new clone of the repository, so I am not yet 100% sure that this builds as-is. However, I am doing a new build now, so if there are any problems, I will fix them first thing Monday morning. I will also run the unit tests at that time.

@macumber @DavidGoldwasser, I fixed bugs "for" both of you on this branch. Do you both want to test your respective bugs, or maybe one of you can do all of the testing? The bugs in question are:

https://www.pivotaltracker.com/story/show/58943042
https://www.pivotaltracker.com/story/show/59059622
https://www.pivotaltracker.com/story/show/59049884
https://www.pivotaltracker.com/story/show/52494241