Added watch grunt task
Cleaned up main sass file