My code was indented badly. Fixed it.
Merge branch 'master' of https://github.com/isenseDev/rSENSE into UIfixes
tooltips
- Hassan was using the wrong data_entry functions
- There were extra ajax calls for no reason
- Edit was suddenly using the wrong data_entry functions
Merge branch 'fix_data_entry' of github.com:jdalphon/rSENSE into fix_data_entry
Writting a test to make sure that edit uses the correct data format, and that it actually edits the data
Updating a fail case
Merge pull request #1197 from Evana13G/master

tooltips
Merge branch 'master' of https://github.com/isenseDev/rSENSE into UIfixes
Merge pull request #1209 from jdalphon/fix_data_entry

Fix data entry
Merge branch 'master' of https://github.com/isenseDev/rSENSE into UIfixes
Copyedits to tooltips.
Another copyedit on the tooltips.
User page removed first/last/username and added display name
Merge branch 'master' of https://github.com/isenseDev/rSENSE into parachute
-Clean up a lot of the css involving isotope items.
Merge branch 'master' of github.com:isenseDev/rSENSE into mm1188

Conflicts:
	app/views/projects/index.html.erb
	app/views/visualizations/index.html.erb
Fixed misaligned contact page.
-@jdalphon is a silly.
-Made items have linked titles to aid in testing.