Remove EuroSciPy 2013 contributions.
Update conf info for 2014.
after final proof read
after the after final proof read
Merge remote-tracking branch 'giannis/master'

Conflicts:
	papers/Kieffer_Ashiotis/pyFAI.rst
minor typo