Get Parbs fixes back in.

[Aubrey Portwood]

Because some of the changes recently made, I had to revert all the changes made as some of them were breaking saving of the API key, etc. So what I did was reverted the commits (using revert --no-commit) into a couple commits to get master back to what was working.

Then, I created the [parbs-fixes-un-reverted](https://github.com/WebDevStudios/wds-exacttarget-data-extension-api/tree/parbs-fixes-un-reverted) branch and un-reverted those revert commits bringing his changes back on that branch. What we need to do is clean up his branch when we have time and fully test it before merging in.