Fix coffee bundle for mac osx
Merge remote-tracking branch 'origin/master'

Conflicts:
	.idea/libraries/Generated_files.xml
	.idea/watcherTasks.xml
	.idea/workspace.xml
	dist/oblique.coffee
	dist/oblique.map
Fixed bug calc Directive hash