updated submodules
added haml submodule