fixed bug with siphon keyword detection
keywords and strings are cool
version
Version bump to prevent an ancient version of fs from polluting
Merge branch 'develop' of github.com:caribou/caribou-frontend into develop

Conflicts:
	project.clj
0.12.18
resolve conflicts