added *.swp to gitignore
Merge branch 'master' of https://github.com/tclose/PyNN
Merge branch 'master' of https://github.com/tclose/PyNN
Merge branch 'master' of https://github.com/tclose/PyNN

Conflicts:
	src/recording/__init__.py
Removed all the Subversion keyword substitutions in the master branch
Removed Subversion keyword substitutions from NMODL files in the master branch. Closes #239
Merge branch 'master' of https://github.com/tclose/PyNN
Imported MPI flags (MPI.DOUBLE & MPI.SUM) alongside as COMM_WORLD in
get_mpi_comm that are required in various functions in the module.
Where a list/array of Sequences is expected, can now provide a list of lists/tuples. Fixes #213
Commented out some puzzling test failures. Need to talk to a NEST developer.
Added configuration file for Travis CI
Fiddling with the Travis configuration.
NEST and NEURON unit tests are now skipped if the simulators are not installed.
`gather_blocks()` now returns the local block on all MPI nodes other than the root node. On the root node it returns a merged block, as before. Fixes #248.
Changed the default precision for `pyNN.nest` to "off_grid". This reflects the PyNN philosophy that defaults should prioritize accuracy and compatibility over performance.
Added information about units to docstrings (fixes #178).
Added a `get_simulator()` function (closes #65) and modified some of the example scripts to use it.
Izhikevich standard cell is now available for NEURON and NEST backends.
Spelling correction.
Merge branch 'master' of https://github.com/NeuralEnsemble/PyNN