Merge branch 'development' of https://github.com/MetaCell/NetPyNE-UI into development

Author: tarelli

netpyne_ui/netpyne_geppetto.py

@@ -453,7 +453,7 @@ def globalMessageHandler(identifier, command, parameters):
         GeppettoJupyterModelSync.events_controller.triggerEvent(
             "receive_python_message", {'id': identifier, 'response': response})
     except Exception as e:
-        return self.getJSONError("Unhandle exception in Global Message Handler",traceback.format_exc())
+        return netpyne_geppetto.getJSONError("Unhandle exception in Global Message Handler",traceback.format_exc())
 
 
 def configure_logging():

utilities/gitall.py

@@ -77,6 +77,9 @@ def main(argv):
     elif(argv[0] == 'remote'):
         command = ['git', 'remote', '-v']
 
+    elif(argv[0] == 'diff'):
+        command = ['git', 'diff']
+
     elif(argv[0] == 'checkout'):
         if(len(argv) == 2):
             command = ['git', 'checkout', argv[1]]