Omnibus Pull Request from Parse.ly Branch

There's been a lot of all the fixes over the past few weeks. All the relevant information can be found in the commit messages, instead of duplicating that here.