Removed aafig from conf.py and pyst.txt
added a spiketrain merging function that performs few merges on lists (divide and conquer).
re-added Emre's recent edits after accidentally deleting them
Merge branch 'headless' of https://github.com/inincs/pyNCS into development
improved Monitors and Sequencers test