Commit 04/14/2014

Minor tweak to rooms. Mostly just syncing with the master branch to keep
updated and to host a test server on the box.