Oh fuck it's mock time
Merge branch 'master' of github.com:araju/maslab-2014