[merge] merge master into devel

README.md

@@ -1,5 +1,6 @@
 # GPy
 
+
 A Gaussian processes framework in Python.
 
 * [GPy homepage](http://sheffieldml.github.io/GPy/)
@@ -10,6 +11,19 @@ A Gaussian processes framework in Python.
 
 Continuous integration status: ![CI status](https://travis-ci.org/SheffieldML/GPy.png)
 
+### Citation
+
+    @Misc{gpy2014,
+      author =   {The GPy authors},
+      title =    {{GPy}: A Gaussian process framework in python},
+      howpublished = {\url{http://github.com/SheffieldML/GPy}},
+      year = {2012--2014}
+    }
+
+### Pronounciation
+
+We like to pronounce it 'Gee-pie'.
+
 ### Getting started: installing with pip
 
 We are now requiring the newest version of ![scipy](http://www.scipy.org/) and thus, we strongly recommend using 
@@ -83,8 +97,12 @@ clone this git repository and add it to your path:
  
 ### OSX
 
-Everything appears to work out-of-the box using ![enthought](http://www.enthought.com) on osx Mavericks. Download/clone GPy, and then add GPy to your PYTHONPATH
+Everything appears to work out-of-the box using 
+![anaconda python distribution](http://continuum.io/downloads) 
+on osx Mavericks. 
+Download/clone GPy, and then add GPy to your PYTHONPATH
 
+    conda update scipy
     git clone git@github.com:SheffieldML/GPy.git ~/SheffieldML
     echo 'PYTHONPATH=$PYTHONPATH:~/SheffieldML' >> ~/.profile
 
@@ -137,7 +155,9 @@ Run nosetests from the root directory of the repository:
 or from within IPython
 
     import GPy; GPy.tests()
-		    
+
+
+
 ## Funding Acknowledgements