Minor formatting changes
Add mapping to controller methods
Merge branch 'master' of github.com:jdavis/nebulous-adventure