Add pointcut references to the pointcut grammar #57
Remove pointcut property from annotations, update demo #57