Fixed small makefile error and made the quarter round definition not exist outside the salsa20_core function