Merge pull request #1 from cybermerc/master

fixing some tests
amazon/2013.09 passes spec tests for at least custom_stepinto_spec
fixing the rest of spectests for amazon-2013.09
additional test updates
cleanup