2 Code Reviews - VULAB

[electBlake]

I have 2 patches that would love some code reviewing :)

1. http://issues.fluidproject.org/browse/VULAB-193
- this issue resolves some of the conflicts that arose while I was  
trying to sync the svn repo to the website. This is the 2nd repost of  
this issue.

2. http://issues.fluidproject.org/browse/VULAB-194
- new patch, basically fixes the url to rascal videos.


Thanks,
- Blake