Merge branch 'master' of github.com:collectionspace/services

diff --cc README.txt
index ef49f8bb13328aab8e8ab0c2529e5eb50c9bb667,9e3d9bb10b0edece7b7dde3c373dd8daddc8f244..d53c0a220135011f2a2387683c9b163c3381bc6f
--- 1/README.txt
--- 2/README.txt
+++ b/README.txt
@@@ -20,9 -20,11 +20,11 @@@ All good boys deserve fudge
  
  All SSH keys deserve better.
  
+ All SSH keys deserve fudge.
+ =======
  Make 1 - Edited on github
  Make 2
 -Make 3
 +Make 3 - Edited locally
  Make 4
  Make 5
  Make 6 - Edited on github