Develop

Fix for the 14.04 error and the Ipython.display import error