Made interface nicer, better feedback, better design overall.
Merge branch 'master' of github.com:alextoombs/citiloco, integrating Shane's work with my design changes.
Some quick readability changes and comments