Finished fixing lint problems
Merge branch '1.5.0-DEV' of github.com:gitana/alpaca into 1.5.0-DEV