replacing unicorn with puma, making it depend on .env config

removing duplicate gems from testing

rebasing

only use puma worker killer in prod
exposes a function that lets use, show, hide, and remove dom objects based on current users username

cleaning up some whitespace changes

adding newline to end of applition.html.haml

adding newline to end of _current_user_js.html.haml
Added the ability to override vagrant settings
Merge pull request #33 from akosednar/custom_vagrant_settings

Added the ability to override vagrant settings [skip ci]
Fix location changing
[skip ci] Refactored the Vagrantfile and made NFS syncing optional
Rewrite location add function and add tests
Fix network buttons on protips

Task #128
Merged @Wesley PR for WIP #31
Merge branch 'wesleylancel-location-fix'
Merge pull request #32 from dvito/wip_62_edit_delete_comment

Moves hiding/showing the edit/delete/reply links to javascript function thats reusable across the application
Lowered the defaults for the VBox and allow for only setting one or the other VM configuration values
Merge pull request #36 from wesleylancel/protip-network-fix

Fix network buttons on protips
Merged Puma configuration from @dvito
Merge branch 'dvito-puma'
Converting to Puma
Fix conflict #84