NEW: plot_voltages, plot_bcpnn_traces
fixed conn_file merge bug + voltage plotting scripts
merge