merged more fixes from devel
[selectricity] / app /
drwxr-xr-x   ..
drwxr-xr-x - controllers
drwxr-xr-x - helpers
drwxr-xr-x - models
drwxr-xr-x - views

Benjamin Mako Hill || Want to submit a patch?