Updating for cutting the slicer out.
Merge branch 'master' of https://github.com/jaguirre/APRA2014