Removed the ugly two boffer implementation.
Merge branch 'master' of github.com:GL-MPRI-2014/GL_MPRI_2014