Merge branch 'origin/roy'

* refs/remotes/origin/roy:
  beefed up prim math functions
  adding floor prim to test
  have to commit before i can pull again
  undoing my changes before merge
  adding new prims
fixed error reporting
Merge branch 'origin/bill'

* refs/remotes/origin/bill:
  fixed error reporting