Add integration test for logging in with capybara-webkit
Merge branch 'master' of https://github.com/isenseDev/rSENSE into tests-should-pass
Moved field edit js to the right place. Changed so that the edit button checks the dataset count before deciding if fields can be deleted
Moved field edit js to the right place. Changed so that the edit button checks the dataset count before deciding if fields can be deleted
Update the README.rdoc to talk about iSENSE instead of rails.
-Fixed news functional tests.
Merge pull request #675 from mmcguinn/scratch

-Fixed news functional tests.
Removed map and time pickers from the tabindex (sorta)
Merge branch 'master' of git://github.com/isenseDev/rSENSE into fieldsTable
Merge branch 'master' of git://github.com/isenseDev/rSENSE into jd_issue668
Merge pull request #674 from jdalphon/fieldsTable

Changes to fields table
-Fixed field order in export.
Merge pull request #676 from mmcguinn/mm670

-Fixed field order in export.
Merge branch 'master' of https://github.com/isenseDev/rSENSE into tests-should-pass
Now with the changes.
Merge branch 'master' of https://github.com/isenseDev/rSENSE into better-readme
Merge pull request #673 from NatTuck/better-readme

Update the README.rdoc to talk about iSENSE instead of rails.
Formatted the login box so that the nav bar wasn't cutting the top of it off. Also, made Fred and Ivan's email clickable links.
-Fixed the detection of having so tags to work on not just Nat's computer.
Merge branch 'master' of git://github.com/isenseDev/rSENSE into jd_issue668