Merge pull request #202 from isaacfreeman/1.0.x

Set different asset directory when in development, so we don't get produ...
Merge pull request #203 from isaacfreeman/1.0.x

Nested module declarations in permalinks.rb