Now with more requires.
Merge pull request #1009 from NatTuck/require-nokogiri

Now with more requires.
Set file permissions for uploaded files.
Merge pull request #1010 from NatTuck/upload-permissions

Set file permissions for uploaded files.
Killing bootstrap gem
merge conflict
Add terrible route for edit data set.
Started overhaul of CSS, fixing structure of pages after bootstrap upgrade
More css overhauling, fixing modals, fixing icons
Getting rid of extra bootstrap css file

Signed-off-by: jdalphon <jdalphon@jdalphon-dev.(none)>
Customizing bootstrap
Clean up reloading and pressing enter on edit fields.
Merge pull request #1018 from NatTuck/edit-dataset-route

Add terrible route for edit data set.
Merge branch 'master' of git://github.com/isenseDev/rSENSE into degem-bootstrap
More changes to bring the website up to bootstrap3
updating a test to find the correct item on the page
Merge pull request #1019 from NatTuck/cleanup-fields-edit

Clean up reloading and pressing enter on edit fields.
Adding the flash helpers back in
Merge branch 'master' of git://github.com/isenseDev/rSENSE into degem-bootstrap
fixing test helper (not sure how it got unfixed)