Finalized a bit more of the update code
Update for 2014-11-10
Merge pull request #314 from lawinslow/master

Update code and 2014-11-10 update