commit 26ee723380d3524f2caeb5d68175b0375983894a parent 77fb98fda26dd9ae8bb83bc0001bc8c4d6aa30d9 Author: eamoncaddigan <eamon.caddigan@gmail.com> Date: Sun, 31 Jan 2016 13:54:12 -0500 Merge remote-tracking branch 'upstream/master' Conflicts: README.md Diff is too large, output suppressed.