Removed *.pyc *.swp *~ octave-core files
Don't ignore source files like ClusteringTheano.py
Merge remote-tracking branch 'opencog/master'

merged with strategy=ours to ignore the other changes with the
.gitignore that I redid on this branch