Merge branch 'master' of https://github.com/corbindavenport/nexus-tools

Conflicts:
install.sh
fix conflict