replaced enlive for hiccup and upgraded some libs