Merge branch 'master' of https://github.com/isenseDev/rSENSE
Merge branch 'master' of https://github.com/isenseDev/rSENSE
Merge branch 'master' of https://github.com/isenseDev/rSENSE
Merge branch 'master' of https://github.com/isenseDev/rSENSE
makin a pull
Yay we have a HighVis object
Merge pull request #73 from hmcq6/HM_Vis

Hm vis
Merge pull request #78 from jdalphon/fix_login

Added error msg for failed login
Merge pull request #79 from jdalphon/fix_login

removed a console log
Importing all vis files, plus some changes. This is a huge commit. It may break everything ever. I'm so sorry.
Merge pull request #81 from efairbanks/master

Visualizations are in!
Commit because things are working and I don't want them to break and then not have something to come back to.
Can now press enter on info edit fields
Merge pull request #82 from jdalphon/jd_issue_80

Can now press enter on info edit fields
Fixed formatting on the users page.
Changed 'Spiders' link to 'Experiment Templates' and temporarily redirects to google
Merge pull request #84 from Evana13G/squashSpiders

Changed 'Spiders' link to 'Experiment Templates' and temporarily redirec...
Merge pull request #85 from jdalphon/master

I fixed some formatting issues
the 'Experiment Templates' link now redirects to 'experiment_templates/index' page and controller and view created for 'experiment_templates'
Added 'Use Location' and some highvis files.