Killing bootstrap gem
merge conflict
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
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
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)
Merge pull request #1020 from jdalphon/degem-bootstrap

Upgrading Bootstrap to v3
Skittles hates me
Merge pull request #1021 from jdalphon/degem-bootstrap

Skittles hates me
Fixed users show page. Removed coffescript thats not nessicary since Jims changes.
I accidently a line
Merge branch 'master' of http://github.com/isenseDev/rSENSE into HM_User_Page
Centering buttons for skittles
location fields are fixed in edit table