uncommenting out the go-file changes that had been commented out
small change to chromedriver note
Merge branch 'dev' into gui
Merge branch 'gui' of github.com:swryan/OpenMDAO-Framework into gui
Merge branch 'dev' into gui
update pangolin image to one with chrome v35
Merge branch 'dev' into gui
Merge branch 'dev' of http://www.github.com/OpenMDAO/OpenMDAO-Framework into dev
skip javascript testing for chrome version > 34
updating AMI for pangolin, retiring quetzal, adding tahr, changing some of the EC2 instance types
bringing in a skip for js_tests
fixing typo in testhosts.cfg
pinning to scipy 0.11.0 or higher; removing a machine from release testing.
Changing mkinstaller to reflect new scipy version pinning
fixing merge conflict in testhosts.cfg
re-adding go-file
Merge pull request #1764 from kmarsteller/dev

Some testing fixes and a scipy install fix