Merge pull request #121 from jamesongamble/master

Comments out failing test for now, starts editing ionicons for dash view