Only config files customized
Merge branch 'limpia' of udit80.iaa.es:/home/jmiguel/DEVELOP/papi into limpia
Nothing relevant
Merge branch 'limpia' of udit80.iaa.es:/home/jmiguel/DEVELOP/papi into limpia
Merge branch 'limpia' of udit80.iaa.es:/home/jmiguel/DEVELOP/papi into limpia
Merge branch 'limpia' of udit80.iaa.es:/home/jmiguel/DEVELOP/papi into limpia
Implemented new way to convert PyFITS warnings into Exceptions and also how to be deactivate later.
Added new module for Astrometric computation based on Astrometry.net.
Merge branch 'master' into limpia

Conflicts:
	doc/diary.txt
My update
Merge branch 'limpia' of udit80.iaa.es:/home/jmiguel/DEVELOP/papi into limpia