Master branch update

* Update from live kisakone codebase to master.
* Add vagrantup to master as well.
* Cherry-picked patch from season2013 to make kisakone work from root level