Imported recent corrections, no conflicts

Some recent corrections that were done by Raul are now merged into the
pipeline. There weren't any conflicts.

1 files changed, 115 insertions, 0 deletions

diff --git a/tex/src/references.tex b/tex/src/references.tex
index a0f606f..641089e 100644
--- a/tex/src/references.tex
+++ b/tex/src/references.tex
@@ -129,6 +129,7 @@ archivePrefix = "arXiv",
 
 
 
+
 @ARTICLE{astropy2013,
    author = {{Astropy Collaboration} and {Robitaille}, T.~P. and {Tollerud}, E.~J. and
 	{Greenfield}, P. and {Droettboom}, M. and {Bray}, E. and {Aldcroft}, T. and
@@ -158,3 +159,117 @@ archivePrefix = "arXiv",
    adsurl = {http://adsabs.harvard.edu/abs/2013A\%26A...558A..33A},
   adsnote = {Provided by the SAO/NASA Astrophysics Data System}
 }
+
+
+
+
+
+@ARTICLE{cython2011,
+   author = {{Behnel}, S. and {Bradshaw}, R. and {Citro}, C. and {Dalcin}, L. and
+	{Seljebotn}, D.~S. and {Smith}, K.},
+    title = "{Cython: The Best of Both Worlds}",
+  journal = {CiSE},
+     year = 2011,
+    month = mar,
+   volume = 13,
+   number = 2,
+    pages = {31},
+      doi = {10.1109/MCSE.2010.118},
+   adsurl = {http://adsabs.harvard.edu/abs/2011CSE....13b..31B},
+  adsnote = {Provided by the SAO/NASA Astrophysics Data System}
+}
+
+
+
+
+
+@ARTICLE{mpi4py2011,
+   author = {{Dalcin}, L.~D. and {Paz}, R.~R. and {Kler}, P.~A. and {Cosimo}, A.
+	},
+    title = "{Parallel distributed computing using Python}",
+  journal = {Advances in Water Resources},
+     year = 2011,
+    month = sep,
+   volume = 34,
+    pages = {1124},
+      doi = {10.1016/j.advwatres.2011.04.013},
+   adsurl = {http://adsabs.harvard.edu/abs/2011AdWR...34.1124D},
+  adsnote = {Provided by the SAO/NASA Astrophysics Data System}
+}
+
+
+
+
+
+@ARTICLE{scipy2011,
+author={K. J. {Millman} and M. {Aivazis}},
+journal={CiSE},
+title={Python for Scientists and Engineers},
+year={2011},
+volume={13},
+number={2},
+pages={9},
+keywords={Special issues and sections;Computer languages;Programming;Scientific computing;Numerical models;Programming languages;Python;Scientific computing;interactive research;Python libraries;Python tools},
+doi={10.1109/MCSE.2011.36},
+ISSN={1521-9615},
+month={March},
+}
+
+
+
+
+
+@ARTICLE{numpy2011,
+   author = {{van der Walt}, S. and {Colbert}, S.~C. and {Varoquaux}, G.},
+    title = "{The NumPy Array: A Structure for Efficient Numerical Computation}",
+  journal = {CiSE},
+archivePrefix = "arXiv",
+   eprint = {1102.1523},
+ primaryClass = "cs.MS",
+     year = 2011,
+    month = mar,
+   volume = 13,
+   number = 2,
+    pages = {22},
+      doi = {10.1109/MCSE.2011.37},
+   adsurl = {http://adsabs.harvard.edu/abs/2011CSE....13b..22V},
+  adsnote = {Provided by the SAO/NASA Astrophysics Data System}
+}
+
+
+
+
+
+@Article{matplotlib2007,
+  Author    = {Hunter, J. D.},
+  Title     = {Matplotlib: A 2D graphics environment},
+  Journal   = {CiSE},
+  Volume    = {9},
+  Number    = {3},
+  Pages     = {90},
+  abstract  = {Matplotlib is a 2D graphics package used for Python
+  for application development, interactive scripting, and
+  publication-quality image generation across user
+  interfaces and operating systems.},
+  publisher = {IEEE COMPUTER SOC},
+  doi       = {10.1109/MCSE.2007.55},
+  year      = 2007
+}
+
+
+
+
+
+@ARTICLE{scipy2007,
+author={T. E. {Oliphant}},
+journal={CiSE},
+title={Python for Scientific Computing},
+year={2007},
+volume={9},
+number={3},
+pages={10},
+keywords={high level languages;Python;scientific computing;steering language;scientific codes;high-level language;Scientific computing;High level languages;Libraries;Writing;Application software;Embedded software;Software standards;Standards development;Internet;Prototypes;Python;computer languages;scientific programming;scientific computing},
+doi={10.1109/MCSE.2007.58},
+ISSN={1521-9615},
+month={May},
+}