-Made return of new json upload function sane.
-Removed unnessisary nesting.
Adding a get_next_name for datasets to avoid issue #1162
-Changed to only remove password reset session flag if the password reset actually works.
Getting rid of a fail case in get_next_name
Fixing overflowing pictures when logged out of the website.
Merge branch 'master' of git://github.com/isenseDev/rSENSE
-Fixed image path for area links.
Merge pull request #1165 from jdalphon/jd_issue1162

Adding get_next_name to data_sets
Merge pull request #1167 from jdalphon/master

Fixing overflowing content window for logged out users
Merge pull request #1164 from mmcguinn/mm1157

-Changed to only remove password reset session flag if the password reset actually works.
Merge pull request #1163 from mmcguinn/mm1160

Tweaking return of new json path.
-Take two on fixing areaLink images.
Merge pull request #1168 from mmcguinn/mm1133

-Fixed image path for area links.
Fixing a bug with the json uploader and accepting empty string as a null
data point through the sanitizer.
Merge pull request #1169 from jdalphon/master

jsonDataUpload changes
Upgrading ruby to 2.1.0,
adding ruby 2.1.0 to travis build.
-Added banner warning users to add an email account.
-Added email display to the user page for owners and admins.
Using only latest bundler
Trying to lock in bundler version