Improved instructions for ODBC setup
Added ipython setup
Fixed merge