Merge pull request #50 from jpsiepert/master

Ng-Show fixes
little stuffs here and there
Merge branch 'master' of https://github.com/KorySumsion/forever-planned
Merge pull request #51 from MarkTonkinson/master

Little Changes
push before pull