Fixes #25 and #24 Updating install scripts

@gholtslander 

I'm just gonna merge this beauty.