Merge branch 'jeff-develop' of https://github.com/jeffreybaird/clink
Merge branch 'jeff-develop' of https://github.com/jeffreybaird/clink
Merge branch 'jeff-develop' of https://github.com/jeffreybaird/clink
Merge branch 'jeff-develop' of https://github.com/jeffreybaird/clink
Merge branch 'jeff-develop' of https://github.com/jeffreybaird/clink
Merge branch 'jeff-develop' of https://github.com/jeffreybaird/clink
Add nicknames
Merge nickname fixes