Turned off secure trash and updated hostname
Added some new git aliases/functions
Resolved hostname conflict